diff options
| author | sobomax <sobomax@FreeBSD.org> | 2002-04-26 15:58:01 +0800 |
|---|---|---|
| committer | sobomax <sobomax@FreeBSD.org> | 2002-04-26 15:58:01 +0800 |
| commit | bc3ebcdc519bb2765aa332ddc5e1c709ad1d3f1e (patch) | |
| tree | 8ba2349a834899fa522566b85644099bbc2dce05 | |
| parent | 7c0d5e385b49cdbbfa49aa2b36a8a1bcebe77c17 (diff) | |
| download | freebsd-ports-gnome-bc3ebcdc519bb2765aa332ddc5e1c709ad1d3f1e.tar.gz freebsd-ports-gnome-bc3ebcdc519bb2765aa332ddc5e1c709ad1d3f1e.tar.zst freebsd-ports-gnome-bc3ebcdc519bb2765aa332ddc5e1c709ad1d3f1e.zip | |
Use USE_LIBTOOL.
| -rw-r--r-- | textproc/libxml2/Makefile | 2 | ||||
| -rw-r--r-- | textproc/libxml2/files/patch-configure | 13 | ||||
| -rw-r--r-- | textproc/libxml2/files/patch-ltmain.sh | 45 |
3 files changed, 14 insertions, 46 deletions
diff --git a/textproc/libxml2/Makefile b/textproc/libxml2/Makefile index d8555f4974fa..58ddfe250165 100644 --- a/textproc/libxml2/Makefile +++ b/textproc/libxml2/Makefile @@ -20,7 +20,7 @@ RUN_DEPENDS= pkg-config:${PORTSDIR}/devel/pkgconfig USE_BZIP2= yes USE_GMAKE= yes -GNU_CONFIGURE= yes +USE_LIBTOOL= yes INSTALLS_SHLIB= yes CONFIGURE_ARGS= --with-iconv=${LOCALBASE} \ --with-html-dir=${PREFIX}/share/doc diff --git a/textproc/libxml2/files/patch-configure b/textproc/libxml2/files/patch-configure new file mode 100644 index 000000000000..fc4c106f533f --- /dev/null +++ b/textproc/libxml2/files/patch-configure @@ -0,0 +1,13 @@ + +$FreeBSD$ + +--- configure 2002/04/26 07:47:10 1.1 ++++ configure 2002/04/26 07:47:25 +@@ -5539,6 +5539,7 @@ + + # This can be used to rebuild libtool when needed + LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" ++$ac_aux_dir/ltconfig $LIBTOOL_DEPS + + # Always use our own libtool. + LIBTOOL='$(SHELL) $(top_builddir)/libtool' diff --git a/textproc/libxml2/files/patch-ltmain.sh b/textproc/libxml2/files/patch-ltmain.sh deleted file mode 100644 index 91713d2306f8..000000000000 --- a/textproc/libxml2/files/patch-ltmain.sh +++ /dev/null @@ -1,45 +0,0 @@ - -$FreeBSD$ - ---- ltmain.sh.orig Wed Jan 23 11:38:40 2002 -+++ ltmain.sh Sun Feb 3 01:44:17 2002 -@@ -1037,8 +1037,16 @@ - continue - ;; - -+ -pthread) -+ compile_command="$compile_command -pthread" -+ finalize_command="$finalize_command -pthread" -+ compiler_flags="$compiler_flags -pthread" -+ continue -+ ;; -+ - -module) - module=yes -+ build_old_libs=no - continue - ;; - -@@ -2412,6 +2420,9 @@ - *-*-netbsd*) - # Don't link with libc until the a.out ld.so is fixed. - ;; -+ *-*-freebsd*) -+ # FreeBSD doesn't need this... -+ ;; - *) - # Add libc to deplibs on all other systems if necessary. - if test "$build_libtool_need_lc" = "yes"; then -@@ -4179,10 +4190,12 @@ - fi - - # Install the pseudo-library for information purposes. -+ if /usr/bin/false; then - name=`$echo "X$file" | $Xsed -e 's%^.*/%%'` - instname="$dir/$name"i - $show "$install_prog $instname $destdir/$name" - $run eval "$install_prog $instname $destdir/$name" || exit $? -+ fi - - # Maybe install the static library, too. - test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library" |