pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/devel/libtool Move the libtool changes back to .m4 pat...
details: https://anonhg.NetBSD.org/pkgsrc/rev/d0e26e3d44c1
branches: trunk
changeset: 473541:d0e26e3d44c1
user: tv <tv%pkgsrc.org@localhost>
date: Tue Apr 20 18:29:34 2004 +0000
description:
Move the libtool changes back to .m4 patches, but keep these out of the
way of automatic patching so automake doesn't come into play (and so that
the changes don't show up in the installed autoconf m4 fragments).
Add Interix3 support. Bump PKGREVISION to 1.5.2nb6.
diffstat:
devel/libtool/Makefile.common | 4 +-
devel/libtool/distinfo | 7 +-
devel/libtool/patches/manual-libtool.m4 | 200 +++++
devel/libtool/patches/manual-ltdl.m4 | 14 +
devel/libtool/patches/manual.README | 32 +
devel/libtool/patches/patch-ab | 860 ++++++++++++++++++++-
devel/libtool/patches/patch-ad | 1239 ++++++++++++++++++++++++++++++-
7 files changed, 2279 insertions(+), 77 deletions(-)
diffs (truncated from 2597 to 300 lines):
diff -r de5b99cfab5a -r d0e26e3d44c1 devel/libtool/Makefile.common
--- a/devel/libtool/Makefile.common Tue Apr 20 18:28:11 2004 +0000
+++ b/devel/libtool/Makefile.common Tue Apr 20 18:29:34 2004 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile.common,v 1.48 2004/03/12 16:00:16 danw Exp $
+# $NetBSD: Makefile.common,v 1.49 2004/04/20 18:29:34 tv Exp $
#
DISTNAME= libtool-1.5.2
-PKGREVISION= 5
+PKGREVISION= 6
CATEGORIES= devel pkgtools
MASTER_SITES= ${MASTER_SITE_GNU:=libtool/}
diff -r de5b99cfab5a -r d0e26e3d44c1 devel/libtool/distinfo
--- a/devel/libtool/distinfo Tue Apr 20 18:28:11 2004 +0000
+++ b/devel/libtool/distinfo Tue Apr 20 18:29:34 2004 +0000
@@ -1,9 +1,8 @@
-$NetBSD: distinfo,v 1.38 2004/03/12 00:11:17 danw Exp $
+$NetBSD: distinfo,v 1.39 2004/04/20 18:29:34 tv Exp $
SHA1 (libtool-1.5.2.tar.gz) = d6f1e8fb544d71b3c88fb959521b34b9b6290260
Size (libtool-1.5.2.tar.gz) = 2653072 bytes
-SHA1 (patch-ab.new) = 78e02d32b64c89762e425b5d0b30a14b294f641a
SHA1 (patch-aa) = 173b8f40ebb067e3bcea798b87e822a445d5688e
-SHA1 (patch-ab) = 78e02d32b64c89762e425b5d0b30a14b294f641a
+SHA1 (patch-ab) = 92eb9d9cd825a329172e108fdaa2d2cc68821838
SHA1 (patch-ac) = b09fb38a59875a60bb51c9fb487e940521a71715
-SHA1 (patch-ad) = e2d7a160b2b673346309996b99c423f6b927d1df
+SHA1 (patch-ad) = 26171c5184660fa18b9160ed2313617e90fb7cac
diff -r de5b99cfab5a -r d0e26e3d44c1 devel/libtool/patches/manual-libtool.m4
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/libtool/patches/manual-libtool.m4 Tue Apr 20 18:29:34 2004 +0000
@@ -0,0 +1,200 @@
+$NetBSD: manual-libtool.m4,v 1.1 2004/04/20 18:29:34 tv Exp $
+
+--- libtool.m4.orig Fri Jan 23 01:07:04 2004
++++ libtool.m4
+@@ -1183,8 +1183,9 @@ beos*)
+ ;;
+
+ bsdi4*)
+- version_type=linux
++ version_type=sunos
+ need_version=no
++ need_lib_prefix=no
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+ soname_spec='${libname}${release}${shared_ext}$major'
+ finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
+@@ -1300,15 +1301,15 @@ kfreebsd*-gnu)
+
+ freebsd*)
+ objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
+- version_type=freebsd-$objformat
+- case $version_type in
+- freebsd-elf*)
+- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
++ version_type=sunos
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
++ case $objformat in
++ elf*)
++ soname_spec='${libname}${release}${shared_ext}$major'
+ need_version=no
+ need_lib_prefix=no
+ ;;
+- freebsd-*)
+- library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
++ *)
+ need_version=yes
+ ;;
+ esac
+@@ -1384,15 +1385,22 @@ hpux9* | hpux10* | hpux11*)
+ postinstall_cmds='chmod 555 $lib'
+ ;;
+
++interix*)
++ version_type=sunos
++ need_lib_prefix=no
++ need_version=no
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
++ soname_spec='${libname}${release}${shared_ext}$major'
++ dynamic_linker='Interix ld.so'
++ shlibpath_var=LD_LIBRARY_PATH
++ shlibpath_overrides_runpath=yes
++ hardcode_into_libs=yes
++ ;;
++
+ irix5* | irix6* | nonstopux*)
+ case $host_os in
+ nonstopux*) version_type=nonstopux ;;
+- *)
+- if test "$lt_cv_prog_gnu_ld" = yes; then
+- version_type=linux
+- else
+- version_type=irix
+- fi ;;
++ *) version_type=sunos ;;
+ esac
+ need_lib_prefix=no
+ need_version=no
+@@ -1428,7 +1436,7 @@ linux*oldld* | linux*aout* | linux*coff*
+
+ # This must be Linux ELF.
+ linux*)
+- version_type=linux
++ version_type=sunos
+ need_lib_prefix=no
+ need_version=no
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+@@ -1552,7 +1560,7 @@ sco3.2v5*)
+ ;;
+
+ solaris*)
+- version_type=linux
++ version_type=sunos
+ need_lib_prefix=no
+ need_version=no
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+@@ -2110,10 +2118,13 @@ beos*)
+ lt_cv_deplibs_check_method=pass_all
+ ;;
+
+-bsdi4*)
+- lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib)'
+- lt_cv_file_magic_cmd='/usr/bin/file -L'
+- lt_cv_file_magic_test_file=/shlib/libc.so
++# Versions of BSD/OS prior to 4.0 did no have real dynamic linking
++bsdi1*|bsdi2*|bsdi3*)
++ dynamic_linker=no
++ ;;
++
++bsdi*)
++ lt_cv_deplibs_check_method=pass_all
+ ;;
+
+ cygwin*)
+@@ -2171,6 +2182,10 @@ hpux10.20* | hpux11*)
+ esac
+ ;;
+
++interix*)
++ lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|_pic\.a)$'
++ ;;
++
+ irix5* | irix6* | nonstopux*)
+ case $LD in
+ *-32|*"-32 ") libmagic=32-bit;;
+@@ -3089,6 +3104,8 @@ case $host_os in
+ ;;
+ esac
+ ;;
++ interix*)
++ ;;
+ irix5* | irix6*)
+ case $cc_basename in
+ CC)
+@@ -3197,6 +3214,13 @@ case $host_os in
+ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
+ wlarc=
++ # Determine if we need to override the c++rt0 that is
++ # picked up by analysing output_verbose_link_cmds
++ if test -f ${PREFIX}/lib/c++rt0/c++rt0.o.PIC; then
++ cpprt0_file="${PREFIX}/lib/c++rt0/c++rt0.o.PIC"
++ else
++ cpprt0_file=
++ fi
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+ _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+@@ -3622,6 +3646,14 @@ if AC_TRY_EVAL(ac_compile); then
+ esac
+ done
+
++ case "$host_os" in
++ netbsd*)
++ if test -n "$cpprt0_file"; then
++ predep_objects_CXX=`eval echo $predep_objects_CXX | sed -e 's:/usr/lib/c++rt0.o:$cpprt0_file:'`
++ fi
++ ;;
++ esac
++
+ # Clean up.
+ rm -f a.out a.exe
+ else
+@@ -4555,9 +4587,11 @@ AC_MSG_CHECKING([for $compiler option to
+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
+ ;;
+ darwin* | rhapsody*)
+- # PIC is the default on this platform
++ # PIC is the default on this platform, and static linking of
++ # binaries generally doesn't work
+ # Common symbols not allowed in MH_DYLIB files
+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
++ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)=''
+ ;;
+ *djgpp*)
+ # DJGPP does not support shared libraries at all
+@@ -4643,6 +4677,8 @@ AC_MSG_CHECKING([for $compiler option to
+ ;;
+ esac
+ ;;
++ interix*)
++ ;;
+ irix5* | irix6* | nonstopux*)
+ case $cc_basename in
+ CC)
+@@ -5131,6 +5167,11 @@ EOF
+ fi
+ ;;
+
++ interix*)
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-h,$soname -o $lib'
++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file $wl$export_symbols -o $lib'
++ ;;
++
+ netbsd*)
+ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
+@@ -5534,6 +5575,14 @@ $echo "local: *; };" >> $output_objdir/$
+ ;;
+ esac
+ fi
++ ;;
++
++ interix*)
++ _LT_AC_TAGVAR(hardcode_direct, $1)=yes
++ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-h,$libdir'
++ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+ ;;
+
+ irix5* | irix6* | nonstopux*)
diff -r de5b99cfab5a -r d0e26e3d44c1 devel/libtool/patches/manual-ltdl.m4
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/libtool/patches/manual-ltdl.m4 Tue Apr 20 18:29:34 2004 +0000
@@ -0,0 +1,14 @@
+$NetBSD: manual-ltdl.m4,v 1.1 2004/04/20 18:29:34 tv Exp $
+
+--- ltdl.m4.orig Sun Sep 21 08:51:38 2003
++++ ltdl.m4
+@@ -149,6 +149,9 @@ AC_CACHE_CHECK([whether deplibs are load
+ hpux10*|hpux11*)
+ libltdl_cv_sys_dlopen_deplibs=yes
+ ;;
++ interix*)
++ libltdl_cv_sys_dlopen_deplibs=yes
++ ;;
+ irix[[12345]]*|irix6.[[01]]*)
+ # Catch all versions of IRIX before 6.2, and indicate that we don't
+ # know how it worked for any of those versions.
diff -r de5b99cfab5a -r d0e26e3d44c1 devel/libtool/patches/manual.README
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/libtool/patches/manual.README Tue Apr 20 18:29:34 2004 +0000
@@ -0,0 +1,32 @@
+$NetBSD: manual.README,v 1.1 2004/04/20 18:29:34 tv Exp $
+
+The "manual-*" patch files are used to maintain the pkgsrc version of
+libtool. These files contain patches for the .m4 files in libtool which are
+used to generate libtool's own "configure" scripts.
+
+These patches are not part of the automatic patches because libtool also
+installs these .m4 files at runtime, and we want the "off-the-shelf"
+versions of those files used instead. So, when it comes time to update
+libtool, the following process should be used:
+
+=====
+
+$ cd /usr/pkgsrc/devel/libtool-base
+$ make configure
+$ cd work*/libtool-*
+$ cat /usr/pkgsrc/devel/libtool/patches/manual-* | patch -s
+
+[edit *.m4 files and put patches back to manual-*]
+
+$ make ./configure
+$ pkgdiff configure >/usr/pkgsrc/devel/libtool/patches/patch-ab
+$ cp -f acinclude.m4 libltdl/
+$ (cd libltdl && make ./configure)
+$ pkgdiff libltdl/configure >/usr/pkgsrc/devel/libtool/patches/patch-ad
+$ cd /usr/pkgsrc/devel/libtool
+$ make makesum
+$ cvs commit
+
+=====
+
+- tv%duh.org@localhost, 20 Apr 2004
diff -r de5b99cfab5a -r d0e26e3d44c1 devel/libtool/patches/patch-ab
--- a/devel/libtool/patches/patch-ab Tue Apr 20 18:28:11 2004 +0000
+++ b/devel/libtool/patches/patch-ab Tue Apr 20 18:29:34 2004 +0000
@@ -1,8 +1,177 @@
-$NetBSD: patch-ab,v 1.33 2004/03/12 00:11:17 danw Exp $
+$NetBSD: patch-ab,v 1.34 2004/04/20 18:29:34 tv Exp $
--- configure.orig Sun Jan 25 07:36:38 2004
-+++ configure Sun Mar 7 11:35:41 2004
-@@ -4424,10 +4424,13 @@ beos*)
++++ configure
+@@ -1156,7 +1156,7 @@ esac
Home |
Main Index |
Thread Index |
Old Index