diff options
| author | Patrick McDermott <patrick.mcdermott@libiquity.com> | 2019-06-28 19:39:46 (EDT) |
|---|---|---|
| committer | Patrick McDermott <patrick.mcdermott@libiquity.com> | 2019-06-28 19:39:46 (EDT) |
| commit | fadb074123594e09b083f4b34028bf8fbdc6ef12 (patch) | |
| tree | 6cde77c3a11942ffd3a2786f45c3733dbb615b6a | |
| parent | e1c3db7911ed6d2db0d5d187d01d05fbfbe636a7 (diff) | |
patches/01_no-bash.patch, patches/02_fix-mconf-linking.patch: Drop
| -rw-r--r-- | changelog | 2 | ||||
| -rw-r--r-- | patches/01_no-bash.patch | 15 | ||||
| -rw-r--r-- | patches/02_fix-mconf-linking.patch | 30 |
3 files changed, 2 insertions, 45 deletions
@@ -1,6 +1,8 @@ linux-libre-4.19 (4.19.56+gnu-1) trunk * New upstream version. + - Drop patches/01_no-bash.patch, issue fixed upstream. + - Drop patches/02_fix-mconf-linking.patch. * Update Maintainer and Homepage. -- Patrick McDermott <patrick.mcdermott@libiquity.com> Fri, 28 Jun 2019 18:50:56 -0400 diff --git a/patches/01_no-bash.patch b/patches/01_no-bash.patch deleted file mode 100644 index 9f032a7..0000000 --- a/patches/01_no-bash.patch +++ /dev/null @@ -1,15 +0,0 @@ -Author: "P. J. McDermott" <pj@pehjota.net> -Subject: Build without GNU Bash - -diff -Naur src.orig/scripts/link-vmlinux.sh src/scripts/link-vmlinux.sh ---- src.orig/scripts/link-vmlinux.sh 2014-04-26 20:16:33.000000000 -0400 -+++ src/scripts/link-vmlinux.sh 2014-05-07 10:58:59.140761084 -0400 -@@ -105,7 +105,7 @@ - } - - # Delete output files in case of error --trap cleanup SIGHUP SIGINT SIGQUIT SIGTERM ERR -+trap cleanup SIGHUP SIGINT SIGQUIT SIGTERM - cleanup() - { - rm -f .old_version diff --git a/patches/02_fix-mconf-linking.patch b/patches/02_fix-mconf-linking.patch deleted file mode 100644 index 4549fde..0000000 --- a/patches/02_fix-mconf-linking.patch +++ /dev/null @@ -1,30 +0,0 @@ -Author: "P. J. McDermott" <pj@pehjota.net> -Subject: Fix mconf linking - -Recent versions of GNU ld no longer resolve references to symbols in implicitly -linked shared objects. - -The object "scripts/kconfig/lxdialog/checklist.o" references the symbol -"acs_map", which is defined in libtinfo.so.5, which is only implicitly linked. - -This hack causes libtinfo.so.5 to be explicitly linked (added to mconf's -DT_NEEDED) for the symbol to be resolved. - -See <https://fedoraproject.org/wiki/UnderstandingDSOLinkChange> for a general -description of ld's behavior. - -(Of course this is only needed to run `make menuconfig`. Normal preconfigured -builds don't need this.) - -diff -Naur src.orig/scripts/kconfig/lxdialog/check-lxdialog.sh src/scripts/kconfig/lxdialog/check-lxdialog.sh ---- src.orig/scripts/kconfig/lxdialog/check-lxdialog.sh -+++ src/scripts/kconfig/lxdialog/check-lxdialog.sh -@@ -10,7 +10,7 @@ - for lib in ncursesw ncurses curses ; do - $cc -print-file-name=lib${lib}.${ext} | grep -q / - if [ $? -eq 0 ]; then -- echo "-l${lib}" -+ echo "-l${lib} -ltinfo" - exit - fi - done |