From a77a76c222ef70f4e326d99cfa170bf1350ca046 Mon Sep 17 00:00:00 2001 From: danh Date: Mon, 19 Feb 2001 18:32:10 +0000 Subject: [PATCH] use included libtool; sync patches --- devel/swig/Makefile | 3 +- .../patches/{patch-aa => patch-Makefile_in} | 9 +- devel/swig/patches/patch-Runtime_Makefile_in | 12 +++ devel/swig/patches/patch-Tools_ltconfig | 52 ++++++++++++ devel/swig/patches/patch-Tools_ltmain_sh | 85 +++++++++++++++++++ devel/swig/patches/patch-ab | 11 --- 6 files changed, 155 insertions(+), 17 deletions(-) rename devel/swig/patches/{patch-aa => patch-Makefile_in} (93%) create mode 100644 devel/swig/patches/patch-Runtime_Makefile_in create mode 100644 devel/swig/patches/patch-Tools_ltconfig create mode 100644 devel/swig/patches/patch-Tools_ltmain_sh delete mode 100644 devel/swig/patches/patch-ab diff --git a/devel/swig/Makefile b/devel/swig/Makefile index 46e2ad0c7e1..95e90488024 100644 --- a/devel/swig/Makefile +++ b/devel/swig/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.16 2001/02/12 02:39:11 kevlo Exp $ +# $OpenBSD: Makefile,v 1.17 2001/02/19 18:32:10 danh Exp $ DISTNAME= swig1.3a5 PKGNAME= swig-1.3a5 @@ -23,7 +23,6 @@ BUILD_DEPENDS+= python1.5::lang/python15 \ WRKDIST= ${WRKDIR}/SWIG1.3a5 -USE_LIBTOOL= Yes CONFIGURE_STYLE=gnu CONFIGURE_ARGS+=--with-tclincl=${LOCALBASE}/include/tcl8.3 \ --with-tcllib==${LOCALBASE}/lib/tcl8.3 \ diff --git a/devel/swig/patches/patch-aa b/devel/swig/patches/patch-Makefile_in similarity index 93% rename from devel/swig/patches/patch-aa rename to devel/swig/patches/patch-Makefile_in index ce262ca482b..a34c5975df5 100644 --- a/devel/swig/patches/patch-aa +++ b/devel/swig/patches/patch-Makefile_in @@ -1,6 +1,7 @@ ---- Makefile.in.orig Tue Sep 12 23:32:08 2000 -+++ Makefile.in Tue Sep 12 23:36:20 2000 -@@ -185,9 +185,9 @@ +$OpenBSD: patch-Makefile_in,v 1.1 2001/02/19 18:32:10 danh Exp $ +--- Makefile.in.orig Thu Sep 21 17:26:02 2000 ++++ Makefile.in Mon Feb 19 13:19:00 2001 +@@ -192,9 +192,9 @@ distclean: clean # TARGETS: install & friends ##################################################################### @@ -12,7 +13,7 @@ MKINSTDIRS = $(srcdir)/mkinstalldirs install: install-main install-lib install-runtime -@@ -199,60 +199,60 @@ +@@ -206,60 +206,60 @@ install-main: @if [ -f swig.exe ]; then \ $(INSTALL_PROGRAM) swig.exe $(BIN_DIR)/swig.exe; \ else \ diff --git a/devel/swig/patches/patch-Runtime_Makefile_in b/devel/swig/patches/patch-Runtime_Makefile_in new file mode 100644 index 00000000000..0a99d86393c --- /dev/null +++ b/devel/swig/patches/patch-Runtime_Makefile_in @@ -0,0 +1,12 @@ +$OpenBSD: patch-Runtime_Makefile_in,v 1.1 2001/02/19 18:32:11 danh Exp $ +--- Runtime/Makefile.in.orig Sat Sep 2 12:25:09 2000 ++++ Runtime/Makefile.in Mon Feb 19 13:19:00 2001 +@@ -25,7 +25,7 @@ install: + @for i in $(LIBS); \ + do \ + if [ -f $$i ]; then \ +- $(LIBTOOL) install -c $$i $(LIB_DIR)/$$i; \ ++ $(LIBTOOL) install -c $$i $(DESTDIR)$(LIB_DIR)/$$i; \ + fi; \ + done; + diff --git a/devel/swig/patches/patch-Tools_ltconfig b/devel/swig/patches/patch-Tools_ltconfig new file mode 100644 index 00000000000..d0cf19e9e1a --- /dev/null +++ b/devel/swig/patches/patch-Tools_ltconfig @@ -0,0 +1,52 @@ +$OpenBSD: patch-Tools_ltconfig,v 1.1 2001/02/19 18:32:11 danh Exp $ +--- Tools/ltconfig.orig Mon Feb 19 13:20:36 2001 ++++ Tools/ltconfig Mon Feb 19 13:25:12 2001 +@@ -1105,6 +1105,9 @@ cygwin* | mingw*) + with_gnu_ld=no + fi + ;; ++openbsd*) ++ with_gnu_ld=no ++ ;; + + esac + +@@ -1396,10 +1399,21 @@ else + ;; + + openbsd*) +- archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linkopts' +- hardcode_libdir_flag_spec='-R$libdir' + hardcode_direct=yes + hardcode_shlibpath_var=no ++ case "$host_os" in ++ openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*) ++ archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linkopts' ++ hardcode_libdir_flag_spec='-R$libdir' ++ ;; ++ *) ++ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $linkopts' ++ hardcode_libdir_flag_spec='${wl}-rpath,$libdir' ++ if [ "`/usr/bin/file /usr/lib/libc.so.* | grep ELF`" != "" ]; then ++ export_dynamic_flag_spec='${wl}-E' ++ fi ++ ;; ++ esac + ;; + + os2*) +@@ -1997,13 +2011,10 @@ netbsd*) + + openbsd*) + version_type=sunos +- if test "$with_gnu_ld" = yes; then +- need_lib_prefix=no +- need_version=no +- fi + library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix' + finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' + shlibpath_var=LD_LIBRARY_PATH ++ deplibs_check_method='pass_all' + ;; + + os2*) diff --git a/devel/swig/patches/patch-Tools_ltmain_sh b/devel/swig/patches/patch-Tools_ltmain_sh new file mode 100644 index 00000000000..d2846769f0a --- /dev/null +++ b/devel/swig/patches/patch-Tools_ltmain_sh @@ -0,0 +1,85 @@ +$OpenBSD: patch-Tools_ltmain_sh,v 1.1 2001/02/19 18:32:11 danh Exp $ +--- Tools/ltmain.sh.orig Mon Feb 19 13:20:03 2001 ++++ Tools/ltmain.sh Mon Feb 19 13:27:41 2001 +@@ -1079,7 +1079,18 @@ compiler." + # These systems don't actually have c library (as such) + continue + ;; ++ *-*-openbsd*) ++ # Do not include libc due to us having libc/libc_r. ++ continue ++ ;; + esac ++ elif test "$arg" = "-lc_r"; then ++ case "$host" in ++ *-*-openbsd*) ++ # Do not include libc_r directly, use -pthread flag. ++ continue ++ ;; ++ esac + elif test "$arg" = "-lm"; then + case "$host" in + *-*-cygwin* | *-*-beos*) +@@ -1091,6 +1102,10 @@ compiler." + deplibs="$deplibs $arg" + ;; + ++ -?thread) ++ deplibs="$deplibs $arg" ++ ;; ++ + -module) + module=yes + continue +@@ -1795,6 +1810,9 @@ compiler." + *-*-cygwin* | *-*-mingw* | *-*-os2* | *-*-beos*) + # these systems don't actually have a c library (as such)! + ;; ++ *-*-openbsd*) ++ # Do not include libc due to us having libc/libc_r. ++ ;; + *) + # Add libc to deplibs on all other systems. + deplibs="$deplibs -lc" +@@ -3554,41 +3572,6 @@ libdir='$install_libdir'\ + + # Exit here if they wanted silent mode. + test "$show" = : && exit 0 +- exit 0 +- echo "----------------------------------------------------------------------" +- echo "Libraries have been installed in:" +- for libdir in $libdirs; do +- echo " $libdir" +- done +- echo +- echo "If you ever happen to want to link against installed libraries" +- echo "in a given directory, LIBDIR, you must either use libtool, and" +- echo "specify the full pathname of the library, or use \`-LLIBDIR'" +- echo "flag during linking and do at least one of the following:" +- if test -n "$shlibpath_var"; then +- echo " - add LIBDIR to the \`$shlibpath_var' environment variable" +- echo " during execution" +- fi +- if test -n "$runpath_var"; then +- echo " - add LIBDIR to the \`$runpath_var' environment variable" +- echo " during linking" +- fi +- if test -n "$hardcode_libdir_flag_spec"; then +- libdir=LIBDIR +- eval flag=\"$hardcode_libdir_flag_spec\" +- +- echo " - use the \`$flag' linker flag" +- fi +- if test -n "$admincmds"; then +- echo " - have your system administrator run these commands:$admincmds" +- fi +- if test -f /etc/ld.so.conf; then +- echo " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'" +- fi +- echo +- echo "See any operating system documentation about shared libraries for" +- echo "more information, such as the ld(1) and ld.so(8) manual pages." +- echo "----------------------------------------------------------------------" + exit 0 + ;; + diff --git a/devel/swig/patches/patch-ab b/devel/swig/patches/patch-ab deleted file mode 100644 index 113266d0be9..00000000000 --- a/devel/swig/patches/patch-ab +++ /dev/null @@ -1,11 +0,0 @@ ---- Runtime/Makefile.in.orig Fri Aug 18 01:33:44 2000 -+++ Runtime/Makefile.in Fri Aug 18 01:34:18 2000 -@@ -25,7 +25,7 @@ - @for i in $(LIBS); \ - do \ - if [ -f $$i ]; then \ -- $(LIBTOOL) install -c $$i $(LIB_DIR)/$$i; \ -+ $(LIBTOOL) install -c $$i $(DESTDIR)$(LIB_DIR)/$$i; \ - fi; \ - done; -