commit: 64b9920871ab1c90a726b07a709fb5efbd432246
parent df1c9e9aba6b6f38228ee8ed63d6a797cc094c97
Author: fosslinux <fosslinux@aussies.space>
Date: Sun, 29 Dec 2024 19:52:36 +1100
Move flex to git snapshots
Diffstat:
9 files changed, 101 insertions(+), 16 deletions(-)
diff --git a/LICENSES/BSD-3-Clause-flex.txt b/LICENSES/BSD-3-Clause-flex.txt
@@ -0,0 +1,42 @@
+Flex carries the copyright used for BSD software, slightly modified
+because it originated at the Lawrence Berkeley (not Livermore!) Laboratory,
+which operates under a contract with the Department of Energy:
+
+Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007 The Flex Project.
+
+Copyright (c) 1990, 1997 The Regents of the University of California.
+All rights reserved.
+
+This code is derived from software contributed to Berkeley by
+Vern Paxson.
+
+The United States Government has rights in this work pursuant
+to contract no. DE-AC03-76SF00098 between the United States
+Department of Energy and the University of California.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+1. Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
+
+Neither the name of the University nor the names of its contributors
+may be used to endorse or promote products derived from this software
+without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
+IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.
+
+This basically says "do whatever you please with this software except
+remove this notice or take advantage of the University's (or the flex
+authors') name".
+
+Note that the "flex.skl" scanner skeleton carries no copyright notice.
+You are free to do whatever you please with scanners generated using flex;
+for them, you are not even bound by the above copyright.
diff --git a/steps/SHA256SUMS.pkgs b/steps/SHA256SUMS.pkgs
@@ -46,7 +46,7 @@ bda6afcd3a390a34a57443269a4857ccc470129f7a557981778c145fd841cbd1 dist-3.5-236_0
0061d240f9bb2bb534db7003ddcc4eae9981954ad72e8f41ff1d76dc449ebd37 file-5.44_0.tar.bz2
eec07e0d710ed3dd8d0ba6a1ec6ca9f1fa3a611bbb225195435679175317bf90 findutils-4.2.33_0.tar.bz2
80798628ccb38521f42e1ca1abe4f0244e4b283e6f662cd354ab70e61a9b4675 flex-2.5.11_0.tar.bz2
-b3a8d59229289ca5a1de6a24c9c828d2847144f6662e0d5b7f41e7ff6e57abaa flex-2.5.33_0.tar.bz2
+62b4ba8e73daf1f4ac4fc1f90e99394e40d7c03dce9fed8539dbc01d024c62e8 flex-2.5.33_0.tar.bz2
e10060b55e2378a065cf8590cae17400c8befc6b3bb0cbbb7093f1b9f46ec4cc flex-2.6.4_0.tar.bz2
5619cf9a893902491a9d8a8f8da4d39efb3606d7d0a72cb4aaa9d1ff798b5495 gawk-3.0.4_0.tar.bz2
62e90abe883f6ccd679adf42d00c2c18a9809bbab599411c81b6c4ac4d446452 gawk-5.3.0_0.tar.bz2
diff --git a/steps/flex-2.5.11/pass1.sh b/steps/flex-2.5.11/pass1.sh
@@ -8,7 +8,6 @@ src_prepare() {
default
touch config.h
- rm parse.c parse.h scan.c skel.c
}
src_compile() {
diff --git a/steps/flex-2.5.11/patches/scan_l.patch b/steps/flex-2.5.11/patches/scan_l.patch
@@ -8,8 +8,8 @@ Comments are unsupported by our flex.
diff --git scan.l scan.l
index 18d0de8..c251a5e 100644
---- flex-2.5.11/scan.l
-+++ flex-2.5.11/scan.l
+--- flex-d160f0247ba1611aa59d28f027d6292ba24abb50/scan.l
++++ flex-d160f0247ba1611aa59d28f027d6292ba24abb50/scan.l
@@ -335,8 +335,8 @@ LEXOPT [aceknopr]
diff --git a/steps/flex-2.5.11/patches/yyin.patch b/steps/flex-2.5.11/patches/yyin.patch
@@ -9,8 +9,8 @@ acidentally re-declare it.
diff --git flexdef.h flexdef.h
index 3eb710a..94ef024 100644
---- flex-2.5.11/flexdef.h
-+++ flex-2.5.11/flexdef.h
+--- flex-d160f0247ba1611aa59d28f027d6292ba24abb50/flexdef.h
++++ flex-d160f0247ba1611aa59d28f027d6292ba24abb50/flexdef.h
@@ -421,7 +421,7 @@ extern int yymore_really_used, reject_really_used;
*/
@@ -31,8 +31,8 @@ index 3eb710a..94ef024 100644
extern char *action_array;
extern int action_size;
extern int defs1_offset, prolog_offset, action_offset, action_index;
---- flex-2.5.11/scan.l
-+++ flex-2.5.11/scan.l
+--- flex-d160f0247ba1611aa59d28f027d6292ba24abb50/scan.l
++++ flex-d160f0247ba1611aa59d28f027d6292ba24abb50/scan.l
@@ -32,6 +32,7 @@
/* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR */
/* PURPOSE. */
diff --git a/steps/flex-2.5.11/sources b/steps/flex-2.5.11/sources
@@ -1 +1 @@
-http://ftp-tel.sjtu.edu.cn/sites/ftp.openpkg.org/sources/DST/flex/flex-2.5.11.tar.gz bc79b890f35ca38d66ff89a6e3758226131e51ccbd10ef78d5ff150b7bd73689
+git://github.com/westes/flex~d160f0247ba1611aa59d28f027d6292ba24abb50 https://github.com/westes/flex/archive/d160f0247ba1611aa59d28f027d6292ba24abb50.tar.gz 68aa10c473b6010ffad680cada09fc4eec6b3cc6e415cc2339e5fc2385ccc142
diff --git a/steps/flex-2.5.33/pass1.sh b/steps/flex-2.5.33/pass1.sh
@@ -6,12 +6,6 @@ src_prepare() {
default
AUTOPOINT=true AUTOMAKE=automake-1.15 ACLOCAL=aclocal-1.15 autoreconf-2.69 -fi
-
- # Remove pregenerated files
- rm parse.c parse.h scan.c
-
- # Remove pregenerated .info
- rm doc/flex.info
}
src_configure() {
diff --git a/steps/flex-2.5.33/patches/disable-unavailables.patch b/steps/flex-2.5.33/patches/disable-unavailables.patch
@@ -0,0 +1,50 @@
+Disable things we can't regenerate for varied reasons.
+
+SPDX-FileCopyrightText: 2025 fosslinux <fosslinux@aussies.space>
+
+SPDX-License-Identifier: BSD-3-Clause-flex
+
+diff --color -ru configure.in
+--- flex-e6f147b7a5f2ec2dc862dc9d30b3734b9555a1ea/configure.in 2024-12-28 11:29:45.497750429 +1100
++++ flex-e6f147b7a5f2ec2dc862dc9d30b3734b9555a1ea/configure.in 2024-12-28 12:37:00.190457545 +1100
+@@ -31,9 +31,6 @@
+
+ dnl checks for programs
+
+-AM_GNU_GETTEXT([external])
+-AM_GNU_GETTEXT_VERSION(0.12)
+-
+ AC_PROG_YACC
+ AM_PROG_LEX
+ AC_PROG_CC
+@@ -97,12 +94,10 @@
+ flex.spec
+ Makefile
+ doc/Makefile
+-website/Makefile
+ examples/Makefile
+ examples/fastwc/Makefile
+ examples/manual/Makefile
+ m4/Makefile
+-po/Makefile.in
+ tools/Makefile
+ tests/Makefile
+ tests/TEMPLATE/Makefile
+diff --color -ru Makefile.am
+--- flex-e6f147b7a5f2ec2dc862dc9d30b3734b9555a1ea/Makefile.am 2024-12-28 11:29:45.496750429 +1100
++++ flex-e6f147b7a5f2ec2dc862dc9d30b3734b9555a1ea/Makefile.am 2024-12-28 13:32:54.945214018 +1100
+@@ -135,13 +135,12 @@
+ doc \
+ m4 \
+ examples \
+- po \
+ tools \
+ tests
+
+ localedir = $(datadir)/locale
+ AM_CPPFLAGS = -DLOCALEDIR=\"$(localedir)\" -I@includedir@ -I$(top_srcdir)/intl
+-LIBS = @LIBINTL@ @LIBS@
++LIBS = @LIBS@
+
+ skel.c: flex.skl mkskel.sh flexint.h tables_shared.h
+ sed 's/m4_/m4postproc_/g; s/m4preproc_/m4_/g' $(srcdir)/flex.skl | $(m4) -P -DFLEX_MAJOR_VERSION=`echo $(VERSION)|cut -f 1 -d .` -DFLEX_MINOR_VERSION=`echo $(VERSION)|cut -f 2 -d .` -DFLEX_SUBMINOR_VERSION=`echo $(VERSION)|cut -f 3 -d .` | sed 's/m4postproc_/m4_/g' | $(SHELL) $(srcdir)/mkskel.sh >skel.c
diff --git a/steps/flex-2.5.33/sources b/steps/flex-2.5.33/sources
@@ -1 +1 @@
-http://ftp-tel.sjtu.edu.cn/sites/ftp.openpkg.org/sources/DST/flex/flex-2.5.33.tar.gz c40385e142989c91989413f3c5a31282b2ffdca16b69cd3ecfde537b8a474921
+git://github.com/westes/flex~e6f147b7a5f2ec2dc862dc9d30b3734b9555a1ea https://github.com/westes/flex/archive/e6f147b7a5f2ec2dc862dc9d30b3734b9555a1ea.tar.gz baec69069ff58b7cdbe0103ffc16f29d4857428c29efcdf685c574d8300fd838
