mirror of
https://github.com/LibreELEC/LibreELEC.tv.git
synced 2025-07-24 11:16:51 +00:00
systemd: update again to systemd-187, fix build
Signed-off-by: Stephan Raue <stephan@openelec.tv>
This commit is contained in:
parent
cc737f6d0e
commit
6c5329082e
@ -28,6 +28,9 @@
|
||||
# dont build parallel
|
||||
MAKEFLAGS=-j1
|
||||
|
||||
# TODO: use cpp directly to avoid using 'gcc -E' in Makefiles
|
||||
export CPP=${TARGET_PREFIX}cpp
|
||||
|
||||
cd $PKG_BUILD
|
||||
./configure --host=$TARGET_NAME \
|
||||
--build=$HOST_NAME \
|
||||
|
@ -19,7 +19,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="systemd"
|
||||
PKG_VERSION="186"
|
||||
PKG_VERSION="187"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
|
42
packages/sysutils/systemd/patches/systemd-187-cpp.patch
Normal file
42
packages/sysutils/systemd/patches/systemd-187-cpp.patch
Normal file
@ -0,0 +1,42 @@
|
||||
diff -Naur systemd-187/Makefile.am systemd-187.patch/Makefile.am
|
||||
--- systemd-187/Makefile.am 2012-07-20 00:40:16.000000000 +0200
|
||||
+++ systemd-187.patch/Makefile.am 2012-07-21 12:50:00.527354759 +0200
|
||||
@@ -1026,7 +1026,7 @@
|
||||
src/core/syscall-to-name.h
|
||||
|
||||
src/core/syscall-list.txt: Makefile
|
||||
- $(AM_V_GEN)cpp $(AM_CPPFLAGS) $(CPPFLAGS) -dM -include sys/syscall.h < /dev/null | $(AWK) '/^#define[ \t]+__NR_[^ ]+[ \t]+[0-9]/ { sub(/__NR_/, "", $$2); print $$2; }' > $@
|
||||
+ $(AM_V_GEN)$(CPP) $(AM_CPPFLAGS) $(CPPFLAGS) -dM -include sys/syscall.h < /dev/null | $(AWK) '/^#define[ \t]+__NR_[^ ]+[ \t]+[0-9]/ { sub(/__NR_/, "", $$2); print $$2; }' > $@
|
||||
|
||||
src/core/syscall-from-name.gperf: src/core/syscall-list.txt Makefile
|
||||
$(AM_V_GEN)$(AWK) 'BEGIN{ print "struct syscall_name { const char* name; int id; };"; print "%null-strings"; print "%%";} { printf "%s, __NR_%s\n", $$1, $$1 }' < $< > $@
|
||||
@@ -2199,7 +2199,7 @@
|
||||
|
||||
src/udev/keymap/keys.txt: Makefile
|
||||
$(AM_V_at)mkdir -p src/udev/keymap
|
||||
- $(AM_V_GEN)cpp $(AM_CPPFLAGS) $(CPPFLAGS) -dM -include linux/input.h < /dev/null | $(AWK) '/^#define[ \t]+KEY_[^ ]+[ \t]+[0-9]/ { if ($$2 != "KEY_MAX") { print $$2 } }' | sed 's/^KEY_COFFEE$$/KEY_SCREENLOCK/' > $@
|
||||
+ $(AM_V_GEN)$(CPP) $(AM_CPPFLAGS) $(CPPFLAGS) -dM -include linux/input.h < /dev/null | $(AWK) '/^#define[ \t]+KEY_[^ ]+[ \t]+[0-9]/ { if ($$2 != "KEY_MAX") { print $$2 } }' | sed 's/^KEY_COFFEE$$/KEY_SCREENLOCK/' > $@
|
||||
|
||||
src/udev/keymap/keys-from-name.gperf: src/udev/keymap/keys.txt Makefile
|
||||
$(AM_V_GEN)$(AWK) 'BEGIN{ print "struct key { const char* name; unsigned short id; };"; print "%null-strings"; print "%%";} { print $$1 ", " $$1 }' < $< > $@
|
||||
diff -Naur systemd-187/Makefile.in systemd-187.patch/Makefile.in
|
||||
--- systemd-187/Makefile.in 2012-07-20 00:45:51.000000000 +0200
|
||||
+++ systemd-187.patch/Makefile.in 2012-07-21 12:50:26.916860425 +0200
|
||||
@@ -9527,7 +9527,7 @@
|
||||
$(AWK) 'BEGIN{ keywords=0 ; FS="," ; print "extern const char load_fragment_gperf_nulstr[];" ; print "const char load_fragment_gperf_nulstr[] ="} ; keyword==1 { print "\"" $$1 "\\0\"" } ; /%%/ { keyword=1} ; END { print ";" }' < $< > $@
|
||||
|
||||
src/core/syscall-list.txt: Makefile
|
||||
- $(AM_V_GEN)cpp $(AM_CPPFLAGS) $(CPPFLAGS) -dM -include sys/syscall.h < /dev/null | $(AWK) '/^#define[ \t]+__NR_[^ ]+[ \t]+[0-9]/ { sub(/__NR_/, "", $$2); print $$2; }' > $@
|
||||
+ $(AM_V_GEN)$(CPP) $(AM_CPPFLAGS) $(CPPFLAGS) -dM -include sys/syscall.h < /dev/null | $(AWK) '/^#define[ \t]+__NR_[^ ]+[ \t]+[0-9]/ { sub(/__NR_/, "", $$2); print $$2; }' > $@
|
||||
|
||||
src/core/syscall-from-name.gperf: src/core/syscall-list.txt Makefile
|
||||
$(AM_V_GEN)$(AWK) 'BEGIN{ print "struct syscall_name { const char* name; int id; };"; print "%null-strings"; print "%%";} { printf "%s, __NR_%s\n", $$1, $$1 }' < $< > $@
|
||||
@@ -9636,7 +9636,7 @@
|
||||
|
||||
@ENABLE_KEYMAP_TRUE@src/udev/keymap/keys.txt: Makefile
|
||||
@ENABLE_KEYMAP_TRUE@ $(AM_V_at)mkdir -p src/udev/keymap
|
||||
-@ENABLE_KEYMAP_TRUE@ $(AM_V_GEN)cpp $(AM_CPPFLAGS) $(CPPFLAGS) -dM -include linux/input.h < /dev/null | $(AWK) '/^#define[ \t]+KEY_[^ ]+[ \t]+[0-9]/ { if ($$2 != "KEY_MAX") { print $$2 } }' | sed 's/^KEY_COFFEE$$/KEY_SCREENLOCK/' > $@
|
||||
+@ENABLE_KEYMAP_TRUE@ $(AM_V_GEN)$(CPP) $(AM_CPPFLAGS) $(CPPFLAGS) -dM -include linux/input.h < /dev/null | $(AWK) '/^#define[ \t]+KEY_[^ ]+[ \t]+[0-9]/ { if ($$2 != "KEY_MAX") { print $$2 } }' | sed 's/^KEY_COFFEE$$/KEY_SCREENLOCK/' > $@
|
||||
|
||||
@ENABLE_KEYMAP_TRUE@src/udev/keymap/keys-from-name.gperf: src/udev/keymap/keys.txt Makefile
|
||||
@ENABLE_KEYMAP_TRUE@ $(AM_V_GEN)$(AWK) 'BEGIN{ print "struct key { const char* name; unsigned short id; };"; print "%null-strings"; print "%%";} { print $$1 ", " $$1 }' < $< > $@
|
Loading…
x
Reference in New Issue
Block a user