Merge branch '3.2' into 3.3
This commit is contained in:
commit
bbc5f9ab51
@ -1 +1,2 @@
|
||||
46620c53d99157a506cfdd183c999dd6 flex-2.6.3-add_defines.patch
|
||||
a5f65570cd9107ec8a8ec88f17b31bb1 flex-2.6.3.tar.gz
|
||||
|
||||
@ -4,12 +4,16 @@
|
||||
|
||||
name=flex
|
||||
version=2.6.3
|
||||
release=1
|
||||
source=(https://github.com/westes/flex/releases/download/v$version/$name-$version.tar.gz)
|
||||
release=2
|
||||
source=(https://github.com/westes/flex/releases/download/v$version/$name-$version.tar.gz
|
||||
$name-$version-add_defines.patch)
|
||||
|
||||
build() {
|
||||
cd $name-$version
|
||||
|
||||
patch -p1 -i $SRC/$name-$version-add_defines.patch
|
||||
touch doc/flex.1
|
||||
|
||||
./configure --prefix=/usr --disable-nls
|
||||
|
||||
make
|
||||
|
||||
82
flex/flex-2.6.3-add_defines.patch
Normal file
82
flex/flex-2.6.3-add_defines.patch
Normal file
@ -0,0 +1,82 @@
|
||||
From 078b46c69d063aef1715b11348a2871d6036f253 Mon Sep 17 00:00:00 2001
|
||||
From: Christos Zoulas <christos@zoulas.com>
|
||||
Date: Sun, 22 Jan 2017 18:34:30 +0100
|
||||
Subject: [PATCH] Add more defines in the non-reentrant part.
|
||||
|
||||
Fix the reentrant part; don't "#define yyfoo yyfoo" because it breaks
|
||||
code that does #ifndef yywrap ..
|
||||
---
|
||||
src/flex.skl | 16 ++++++++++++++--
|
||||
1 file changed, 14 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/src/flex.skl b/src/flex.skl
|
||||
index 190700f..6a7cde4 100644
|
||||
--- a/src/flex.skl
|
||||
+++ b/src/flex.skl
|
||||
@@ -61,11 +61,17 @@ m4_changequote([[, ]])
|
||||
m4_ifelse(M4_YY_PREFIX,yy,,
|
||||
#define yy_create_buffer M4_YY_PREFIX[[_create_buffer]]
|
||||
#define yy_delete_buffer M4_YY_PREFIX[[_delete_buffer]]
|
||||
-#define yy_flex_debug M4_YY_PREFIX[[_flex_debug]]
|
||||
+#define yy_scan_buffer M4_YY_PREFIX[[_scan_buffer]]
|
||||
+#define yy_scan_string M4_YY_PREFIX[[_scan_string]]
|
||||
+#define yy_scan_bytes M4_YY_PREFIX[[_scan_bytes]]
|
||||
#define yy_init_buffer M4_YY_PREFIX[[_init_buffer]]
|
||||
#define yy_flush_buffer M4_YY_PREFIX[[_flush_buffer]]
|
||||
#define yy_load_buffer_state M4_YY_PREFIX[[_load_buffer_state]]
|
||||
#define yy_switch_to_buffer M4_YY_PREFIX[[_switch_to_buffer]]
|
||||
+#define yypush_buffer_state M4_YY_PREFIX[[push_buffer_state]]
|
||||
+#define yypop_buffer_state M4_YY_PREFIX[[pop_buffer_state]]
|
||||
+#define yyensure_buffer_stack M4_YY_PREFIX[[ensure_buffer_stack]]
|
||||
+#define yy_flex_debug M4_YY_PREFIX[[_flex_debug]]
|
||||
#define yyin M4_YY_PREFIX[[in]]
|
||||
#define yyleng M4_YY_PREFIX[[leng]]
|
||||
#define yylex M4_YY_PREFIX[[lex]]
|
||||
@@ -107,7 +113,7 @@ m4_ifdef( [[M4_YY_PREFIX]],, [[m4_define([[M4_YY_PREFIX]], [[yy]])]])
|
||||
|
||||
m4preproc_define(`M4_GEN_PREFIX',
|
||||
``[[#define yy$1 ]]M4_YY_PREFIX[[$1]]
|
||||
-m4_define([[yy$1]], [[M4_YY_PREFIX[[$1]]m4_ifelse($'`#,0,,[[($'`@)]])]])'')
|
||||
+%# m4_define([[yy$1]], [[M4_YY_PREFIX[[$1]]m4_ifelse($'`#,0,,[[($'`@)]])]])'')
|
||||
|
||||
%if-c++-only
|
||||
/* The c++ scanner is a mess. The FlexLexer.h header file relies on the
|
||||
@@ -120,6 +126,7 @@ m4_define([[yy$1]], [[M4_YY_PREFIX[[$1]]m4_ifelse($'`#,0,,[[($'`@)]])]])'')
|
||||
%endif
|
||||
|
||||
%if-c-only
|
||||
+m4_ifelse(M4_YY_PREFIX,yy,,
|
||||
M4_GEN_PREFIX(`_create_buffer')
|
||||
M4_GEN_PREFIX(`_delete_buffer')
|
||||
M4_GEN_PREFIX(`_scan_buffer')
|
||||
@@ -155,6 +162,7 @@ m4_define([[yy$1]], [[M4_YY_PREFIX[[$1]]m4_ifelse($'`#,0,,[[($'`@)]])]])'')
|
||||
M4_GEN_PREFIX(`set_column')
|
||||
]])
|
||||
M4_GEN_PREFIX(`wrap')
|
||||
+)
|
||||
%endif
|
||||
|
||||
m4_ifdef( [[M4_YY_BISON_LVAL]],
|
||||
@@ -170,11 +178,14 @@ m4_ifdef( [[<M4_YY_BISON_LLOC>]],
|
||||
]])
|
||||
|
||||
|
||||
+m4_ifelse(M4_YY_PREFIX,yy,,
|
||||
M4_GEN_PREFIX(`alloc')
|
||||
M4_GEN_PREFIX(`realloc')
|
||||
M4_GEN_PREFIX(`free')
|
||||
+)
|
||||
|
||||
%if-c-only
|
||||
+m4_ifelse(M4_YY_PREFIX,yy,,
|
||||
m4_ifdef( [[M4_YY_NOT_REENTRANT]],
|
||||
[[
|
||||
M4_GEN_PREFIX(`text')
|
||||
@@ -184,6 +195,7 @@ m4_ifdef( [[M4_YY_NOT_REENTRANT]],
|
||||
M4_GEN_PREFIX(`_flex_debug')
|
||||
M4_GEN_PREFIX(`lineno')
|
||||
]])
|
||||
+)
|
||||
%endif
|
||||
|
||||
|
||||
@ -319,6 +319,9 @@ drwxr-xr-x root/root usr/share/kbd/keymaps/i386/azerty/
|
||||
drwxr-xr-x root/root usr/share/kbd/keymaps/i386/bepo/
|
||||
-rw-r--r-- root/root usr/share/kbd/keymaps/i386/bepo/fr-bepo-latin9.map.gz
|
||||
-rw-r--r-- root/root usr/share/kbd/keymaps/i386/bepo/fr-bepo.map.gz
|
||||
drwxr-xr-x root/root usr/share/kbd/keymaps/i386/carpalx/
|
||||
-rw-r--r-- root/root usr/share/kbd/keymaps/i386/carpalx/carpalx-full.map.gz
|
||||
-rw-r--r-- root/root usr/share/kbd/keymaps/i386/carpalx/carpalx.map.gz
|
||||
drwxr-xr-x root/root usr/share/kbd/keymaps/i386/colemak/
|
||||
-rw-r--r-- root/root usr/share/kbd/keymaps/i386/colemak/en-latin9.map.gz
|
||||
drwxr-xr-x root/root usr/share/kbd/keymaps/i386/dvorak/
|
||||
|
||||
@ -1 +1 @@
|
||||
231b46e7142eb41ea3ae06d2ded3c208 kbd-2.0.3.tar.xz
|
||||
c1635a5a83b63aca7f97a3eab39ebaa6 kbd-2.0.4.tar.xz
|
||||
|
||||
@ -3,18 +3,13 @@
|
||||
# Maintainer: CRUX System Team, core-ports at crux dot nu
|
||||
|
||||
name=kbd
|
||||
version=2.0.3
|
||||
release=2
|
||||
version=2.0.4
|
||||
release=1
|
||||
source=(http://ftp.kernel.org/pub/linux/utils/$name/$name-$version.tar.xz)
|
||||
|
||||
build() {
|
||||
cd $name-$version
|
||||
|
||||
# we don't want a dependency to 'check'
|
||||
sed -i '/^SUBDIR/s/tests//' Makefile.am
|
||||
sed -i '/\[check >= 0.9.4\]/s/^/#/' configure.ac
|
||||
autoreconf --install
|
||||
|
||||
./configure --prefix=/usr \
|
||||
--datadir=/usr/share/kbd \
|
||||
--disable-vlock \
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
drwxr-xr-x root/root lib/
|
||||
lrwxrwxrwx root/root lib/libpcre.so.1 -> libpcre.so.1.2.7
|
||||
-rwxr-xr-x root/root lib/libpcre.so.1.2.7
|
||||
lrwxrwxrwx root/root lib/libpcre.so.1 -> libpcre.so.1.2.8
|
||||
-rwxr-xr-x root/root lib/libpcre.so.1.2.8
|
||||
drwxr-xr-x root/root usr/
|
||||
drwxr-xr-x root/root usr/bin/
|
||||
-rwxr-xr-x root/root usr/bin/pcre-config
|
||||
@ -16,7 +16,7 @@ drwxr-xr-x root/root usr/include/
|
||||
drwxr-xr-x root/root usr/lib/
|
||||
-rw-r--r-- root/root usr/lib/libpcre.a
|
||||
-rwxr-xr-x root/root usr/lib/libpcre.la
|
||||
lrwxrwxrwx root/root usr/lib/libpcre.so -> ../../lib/libpcre.so.1.2.7
|
||||
lrwxrwxrwx root/root usr/lib/libpcre.so -> ../../lib/libpcre.so.1.2.8
|
||||
-rw-r--r-- root/root usr/lib/libpcrecpp.a
|
||||
-rwxr-xr-x root/root usr/lib/libpcrecpp.la
|
||||
lrwxrwxrwx root/root usr/lib/libpcrecpp.so -> libpcrecpp.so.0.0.1
|
||||
|
||||
@ -1 +1 @@
|
||||
e3fca7650a0556a2647821679d81f585 pcre-8.39.tar.bz2
|
||||
41a842bf7dcecd6634219336e2167d1d pcre-8.40.tar.bz2
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
# Maintainer: CRUX System Team, core-ports at crux dot nu
|
||||
|
||||
name=libpcre
|
||||
version=8.39
|
||||
version=8.40
|
||||
release=1
|
||||
source=(ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-$version.tar.bz2)
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user