mirror of
https://github.com/moparisthebest/pacman
synced 2024-12-21 15:28:50 -05:00
Patch ltmain on autoreconf
We used to carry a patched version of ltmain in our repos to fix libtools issues with -Wl,-as-needed. Now that ltmain is "generated" by autoreconf, we manually patch it afterwards. Signed-off-by: Allan McRae <allan@archlinux.org>
This commit is contained in:
parent
1438377401
commit
28cb22e3c2
@ -1,3 +1,4 @@
|
|||||||
#!/bin/sh -xu
|
#!/bin/sh -xu
|
||||||
|
|
||||||
autoreconf -i
|
autoreconf -i
|
||||||
|
(cd build-aux && patch -Np0 -i ltmain-asneeded.patch)
|
||||||
|
3
build-aux/.gitignore
vendored
3
build-aux/.gitignore
vendored
@ -1 +1,2 @@
|
|||||||
*
|
*
|
||||||
|
!ltmain-asneeded.patch
|
||||||
|
33
build-aux/ltmain-asneeded.patch
Normal file
33
build-aux/ltmain-asneeded.patch
Normal file
@ -0,0 +1,33 @@
|
|||||||
|
--- ltmain.sh.orig 2013-06-26 14:31:53.472627840 +1000
|
||||||
|
+++ ltmain.sh 2013-06-26 14:30:56.137038936 +1000
|
||||||
|
@@ -5800,6 +5800,14 @@
|
||||||
|
arg=$func_stripname_result
|
||||||
|
;;
|
||||||
|
|
||||||
|
+ -Wl,*--as-needed*)
|
||||||
|
+ deplibs="$deplibs $wl--as-needed"
|
||||||
|
+ ;;
|
||||||
|
+
|
||||||
|
+ -Wl,*--no-as-needed*)
|
||||||
|
+ deplibs="$deplibs $wl--no-as-needed"
|
||||||
|
+ ;;
|
||||||
|
+
|
||||||
|
-Wl,*)
|
||||||
|
func_stripname '-Wl,' '' "$arg"
|
||||||
|
args=$func_stripname_result
|
||||||
|
@@ -6160,6 +6168,15 @@
|
||||||
|
lib=
|
||||||
|
found=no
|
||||||
|
case $deplib in
|
||||||
|
+ -Wl,--as-needed|-Wl,--no-as-needed)
|
||||||
|
+ if test "$linkmode,$pass" = "prog,link"; then
|
||||||
|
+ compile_deplibs="$deplib $compile_deplibs"
|
||||||
|
+ finalize_deplibs="$deplib $finalize_deplibs"
|
||||||
|
+ else
|
||||||
|
+ deplibs="$deplib $deplibs"
|
||||||
|
+ fi
|
||||||
|
+ continue
|
||||||
|
+ ;;
|
||||||
|
-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \
|
||||||
|
|-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*)
|
||||||
|
if test "$linkmode,$pass" = "prog,link"; then
|
Loading…
Reference in New Issue
Block a user