kpriv/pkgsrc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

PR pkg/53086

Browse source 
Fix the configure code that removes spaces in "-L /some/path" etc.
This commit is contained in:
hans 2018-03-12 16:36:44 +00:00
parent 78eba09b6b
commit 1ef250c921
5 changed files with 39 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
devel/libtool-base/Makefile
View file

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.118 2017/03/06 16:14:07 jperkin Exp $
# $NetBSD: Makefile,v 1.119 2018/03/12 16:36:44 hans Exp $
###########################################################################
###########################################################################
@ -31,6 +31,7 @@
.include "../../devel/libtool/Makefile.common"
PKGNAME= ${DISTNAME:S/-/-base-/}
PKGREVISION= 1
COMMENT= Generic shared library support script (the script itself)

3
devel/libtool-fortran/Makefile
View file

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.15 2017/03/06 16:14:07 jperkin Exp $
# $NetBSD: Makefile,v 1.16 2018/03/12 16:36:44 hans Exp $
###########################################################################
###########################################################################
@ -33,6 +33,7 @@
FILESDIR= ${.CURDIR}/../libtool-base/files
PKGNAME= ${DISTNAME:S/-/-fortran-/}
PKGREVISION= 1
COMMENT= Generic shared library support script (the script itself, incl. Fortran)

4
devel/libtool/distinfo
View file

@ -1,4 +1,4 @@
$NetBSD: distinfo,v 1.103 2017/03/06 16:14:07 jperkin Exp $
$NetBSD: distinfo,v 1.104 2018/03/12 16:36:44 hans Exp $
SHA1 (libtool-2.4.6.tar.gz) = 25b6931265230a06f0fc2146df64c04e5ae6ec33
RMD160 (libtool-2.4.6.tar.gz) = 6f4b4c3e89426652da3acffa707f71bb4ccee26a
@ -7,5 +7,5 @@ Size (libtool-2.4.6.tar.gz) = 1806697 bytes
SHA1 (patch-Makefile.in) = 0adb634335acd5fb280c99b5d43ae568018ca0af
SHA1 (patch-build-aux_depcomp) = ae6f93ad4fac1df648cfcb62601c72f9ebb30233
SHA1 (patch-build-aux_ltmain.sh) = eebdc102cacb1970240abeb4a7310d09d505be02
SHA1 (patch-configure) = 818157dd9bf985657a0089a7d887304b71559837
SHA1 (patch-configure) = 2cbf275a4de712bc151c5065b62b2bdb37c83188
SHA1 (patch-libltdl_configure) = 87535836200547ceb8463a98e86561c2adf1f0ed

24
devel/libtool/patches/manual-libtool.m4
View file

@ -1,4 +1,4 @@
$NetBSD: manual-libtool.m4,v 1.46 2017/03/06 16:14:07 jperkin Exp $
$NetBSD: manual-libtool.m4,v 1.47 2018/03/12 16:36:44 hans Exp $
Support mirbsd/midnightbsd.
Handle pkgsrc wrappers.
@ -98,7 +98,7 @@ Fixup output on various OS.
esac
need_lib_prefix=no
need_version=no
@@ -2887,19 +2899,36 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu
@@ -2887,19 +2899,36 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu
dynamic_linker='GNU/Linux ld.so'
;;
@ -163,7 +163,7 @@ Fixup output on various OS.
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=yes
@@ -3546,12 +3575,19 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu
@@ -3546,12 +3575,19 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu
lt_cv_deplibs_check_method=pass_all
;;
@ -384,7 +384,7 @@ Fixup output on various OS.
AC_PROG_CXXCPP
else
_lt_caught_CXX_error=yes
@@ -7079,6 +7179,22 @@ if test yes != "$_lt_caught_CXX_error";
@@ -7079,6 +7179,22 @@ if test yes != "$_lt_caught_CXX_error";
_LT_TAGVAR(ld_shlibs, $1)=no
;;
@ -407,7 +407,7 @@ Fixup output on various OS.
mvs*)
case $cc_basename in
cxx*)
@@ -7093,15 +7209,13 @@ if test yes != "$_lt_caught_CXX_error";
@@ -7093,15 +7209,13 @@ if test yes != "$_lt_caught_CXX_error";
;;
netbsd*)
@ -430,7 +430,7 @@ Fixup output on various OS.
;;
*nto* | *qnx*)
@@ -7275,7 +7389,7 @@ if test yes != "$_lt_caught_CXX_error";
@@ -7275,7 +7389,7 @@ if test yes != "$_lt_caught_CXX_error";
# GNU C++ compiler with Solaris linker
if test yes,no = "$GXX,$with_gnu_ld"; then
_LT_TAGVAR(no_undefined_flag, $1)=' $wl-z ${wl}defs'
@ -439,11 +439,15 @@ Fixup output on various OS.
_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-h $wl$soname -o $lib'
_LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
$CC -shared $pic_flag -nostdlib $wl-M $wl$lib.exp $wl-h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
@@ -7535,6 +7649,7 @@ if AC_TRY_EVAL(ac_compile); then
@@ -7534,8 +7648,9 @@ if AC_TRY_EVAL(ac_compile); then
-L* | -R* | -l*)
# Some compilers place space between "-{L,R}" and the path.
# Remove the space.
if test x-L = "$p" ||
+ test x-l = "$p" ||
test x-R = "$p"; then
- if test x-L = "$p" ||
- test x-R = "$p"; then
+ if test x-L = x"$p" ||
+ test x-l = x"$p" ||
+ test x-R = x"$p"; then
prev=$p
continue
fi

30
devel/libtool/patches/patch-configure
View file

@ -1,9 +1,9 @@
$NetBSD: patch-configure,v 1.1 2017/03/06 16:14:07 jperkin Exp $
$NetBSD: patch-configure,v 1.2 2018/03/12 16:36:44 hans Exp $
Automatically generated using manual-* patches and bootstrap.
DO NOT MODIFY THIS PATCH MANUALLY! YOUR CHANGES WILL BE LOST!
--- configure.orig 2017-02-02 10:07:28.000000000 +0000
--- configure.orig 2018-03-12 10:30:57.156767466 +0000
+++ configure
@@ -5903,7 +5903,7 @@ else
lt_cv_sys_max_cmd_len=8192;
@ -24,7 +24,7 @@ DO NOT MODIFY THIS PATCH MANUALLY! YOUR CHANGES WILL BE LOST!
: ${CP="cp -f"}
: ${MV="mv -f"}
: ${RM="rm -f"}
@@ -6369,12 +6372,19 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu
@@ -6369,12 +6372,19 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu
lt_cv_deplibs_check_method=pass_all
;;
@ -428,14 +428,18 @@ DO NOT MODIFY THIS PATCH MANUALLY! YOUR CHANGES WILL BE LOST!
archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-h $wl$soname -o $lib'
archive_expsym_cmds_CXX='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
$CC -shared $pic_flag -nostdlib $wl-M $wl$lib.exp $wl-h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
@@ -16131,6 +16239,7 @@ if { { eval echo "\"\$as_me\":${as_linen
@@ -16130,8 +16238,9 @@ if { { eval echo "\"\$as_me\":${as_linen
-L* | -R* | -l*)
# Some compilers place space between "-{L,R}" and the path.
# Remove the space.
if test x-L = "$p" ||
+ test x-l = "$p" ||
test x-R = "$p"; then
- if test x-L = "$p" ||
- test x-R = "$p"; then
+ if test x-L = x"$p" ||
+ test x-l = x"$p" ||
+ test x-R = x"$p"; then
prev=$p
continue
fi
@@ -16311,9 +16420,15 @@ lt_prog_compiler_static_CXX=
esac
;;
@ -834,14 +838,18 @@ DO NOT MODIFY THIS PATCH MANUALLY! YOUR CHANGES WILL BE LOST!
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=yes
@@ -21450,6 +21674,7 @@ if { { eval echo "\"\$as_me\":${as_linen
@@ -21449,8 +21673,9 @@ if { { eval echo "\"\$as_me\":${as_linen
-L* | -R* | -l*)
# Some compilers place space between "-{L,R}" and the path.
# Remove the space.
if test x-L = "$p" ||
+ test x-l = "$p" ||
test x-R = "$p"; then
- if test x-L = "$p" ||
- test x-R = "$p"; then
+ if test x-L = x"$p" ||
+ test x-l = x"$p" ||
+ test x-R = x"$p"; then
prev=$p
continue
fi
@@ -21604,9 +21829,16 @@ lt_prog_compiler_static_FC=
;;