[pkgsrc/trunk]: pkgsrc Sync cross-libtool-base with libtool-base. Eliminate ...

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc Sync cross-libtool-base with libtool-base. Eliminate ...
From: riastradh <riastradh%pkgsrc.org@localhost>
Date: Wed, 15 Jan 2020 11:30:41 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/d361457f9bd3
branches:  trunk
changeset: 398056:d361457f9bd3
user:      riastradh <riastradh%pkgsrc.org@localhost>
date:      Tue Jul 09 15:45:25 2019 +0000

description:
Sync cross-libtool-base with libtool-base.  Eliminate CROSSBASE.

cross-libtool-base now installs into $PREFIX/cross-$TARGET_ARCH
unconditionally.

diffstat:

 cross/cross-libtool-base/Makefile |   25 ++++++--
 cross/cross-libtool-base/PLIST    |  110 +++++++++++++++++++-------------------
 doc/HOWTO-use-crosscompile        |    7 +--
 mk/bsd.pkg.use.mk                 |    6 +-
 4 files changed, 77 insertions(+), 71 deletions(-)

diffs (226 lines):

diff -r d3b4014e0029 -r d361457f9bd3 cross/cross-libtool-base/Makefile
--- a/cross/cross-libtool-base/Makefile Tue Jul 09 15:38:23 2019 +0000
+++ b/cross/cross-libtool-base/Makefile Tue Jul 09 15:45:25 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2016/07/09 06:37:58 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2019/07/09 15:45:25 riastradh Exp $
 
 # XXX This is kludgerific copypasta of devel/libtool-base/Makefile for
 # cross-compilation.  Please make it go away!
@@ -20,8 +20,13 @@
 # these patch files properly; otherwise your changes WILL be lost on the
 # next libtool update.
 #
-# DO NOT MAKE CHANGES TO patch-ab OR patch-ad WITHOUT FOLLOWING THESE
-# INSTRUCTIONS.  There are no exceptions to this rule.
+# DO NOT MAKE CHANGES TO THESE FILES:
+#
+#   patches/patch-build-aux_ltmain.sh
+#   patches/patch-configure
+#   patches/patch-libltdl_configure
+#
+# WITHOUT FOLLOWING THESE INSTRUCTIONS.  There are no exceptions to this rule.
 #
 ###########################################################################
 ###########################################################################
@@ -31,7 +36,7 @@
 # XXX Tweaked for cross-compilation.
 #PKGNAME=      ${DISTNAME:S/-/-base-/}
 PKGNAME=       ${DISTNAME:S/^libtool-/cross-libtool-base-${MACHINE_ARCH}-/}
-PKGREVISION=   4
+PKGREVISION=   5
 
 COMMENT=       Generic shared library support script (the script itself)
 
@@ -57,8 +62,12 @@
 # and Fortran compilers.
 #
 USE_LANGUAGES=         c c++
-GNU_CONFIGURE_PREFIX=  ${PREFIX}/cross
+# XXX Added for cross-compilation.  XXX Should be ${TARGET_ARCH}, but
+# currently we have to fake-cross-compile libtool because it's broken
+# upstream.
+GNU_CONFIGURE_PREFIX=  ${PREFIX}/cross-${MACHINE_ARCH}
 CONFIGURE_ARGS+=       --disable-ltdl-install
+CONFIGURE_ARGS+=       F77=no FC=no
 
 USE_TOOLS+=            echo
 
@@ -68,7 +77,9 @@
 .PHONY: fix-libtool
 fix-libtool:
        cd ${WRKSRC}; for f in libtool; do                              \
-               ${SED}  -e "s,-L${BUILDLINK_DIR}/lib,," $$f > $$f.new;  \
+               ${SED}  -e "s,-L${BUILDLINK_DIR}/lib *,,g"              \
+                       -e "s,${BUILDLINK_DIR}/lib *,,g"                \
+                       $$f > $$f.new;                                  \
                if [ -x $$f ]; then ${CHMOD} +x $$f.new; fi;            \
                ${MV} -f $$f.new $$f;                                   \
        done
@@ -81,7 +92,7 @@
                ${FILESDIR}/shlibtool.in > ${WRKSRC}/shlibtool
 
 post-install:
-       ${INSTALL_SCRIPT} ${WRKSRC}/shlibtool ${DESTDIR}${PREFIX}/cross/bin/shlibtool
+       ${INSTALL_SCRIPT} ${WRKSRC}/shlibtool ${DESTDIR}${PREFIX}/cross-${MACHINE_ARCH}/bin/shlibtool
 
 BUILDLINK_DEPMETHOD.dlcompat=  build
 
diff -r d3b4014e0029 -r d361457f9bd3 cross/cross-libtool-base/PLIST
--- a/cross/cross-libtool-base/PLIST    Tue Jul 09 15:38:23 2019 +0000
+++ b/cross/cross-libtool-base/PLIST    Tue Jul 09 15:45:25 2019 +0000
@@ -1,55 +1,55 @@
-@comment $NetBSD: PLIST,v 1.2 2018/01/16 09:34:40 maya Exp $
-cross/bin/libtool
-cross/bin/libtoolize
-cross/bin/shlibtool
-cross/man/man1/libtool.1
-cross/man/man1/libtoolize.1
-cross/share/aclocal/libtool.m4
-cross/share/aclocal/ltargz.m4
-cross/share/aclocal/ltdl.m4
-cross/share/aclocal/ltoptions.m4
-cross/share/aclocal/ltsugar.m4
-cross/share/aclocal/ltversion.m4
-cross/share/aclocal/lt~obsolete.m4
-cross/share/libtool/COPYING.LIB
-cross/share/libtool/Makefile.am
-cross/share/libtool/Makefile.in
-cross/share/libtool/README
-cross/share/libtool/aclocal.m4
-cross/share/libtool/build-aux/compile
-cross/share/libtool/build-aux/config.guess
-cross/share/libtool/build-aux/config.sub
-cross/share/libtool/build-aux/depcomp
-cross/share/libtool/build-aux/install-sh
-cross/share/libtool/build-aux/ltmain.sh
-cross/share/libtool/build-aux/missing
-cross/share/libtool/config-h.in
-cross/share/libtool/configure
-cross/share/libtool/configure.ac
-cross/share/libtool/libltdl/lt__alloc.h
-cross/share/libtool/libltdl/lt__argz_.h
-cross/share/libtool/libltdl/lt__dirent.h
-cross/share/libtool/libltdl/lt__glibc.h
-cross/share/libtool/libltdl/lt__private.h
-cross/share/libtool/libltdl/lt__strl.h
-cross/share/libtool/libltdl/lt_dlloader.h
-cross/share/libtool/libltdl/lt_error.h
-cross/share/libtool/libltdl/lt_system.h
-cross/share/libtool/libltdl/slist.h
-cross/share/libtool/loaders/dld_link.c
-cross/share/libtool/loaders/dlopen.c
-cross/share/libtool/loaders/dyld.c
-cross/share/libtool/loaders/load_add_on.c
-cross/share/libtool/loaders/loadlibrary.c
-cross/share/libtool/loaders/preopen.c
-cross/share/libtool/loaders/shl_load.c
-cross/share/libtool/lt__alloc.c
-cross/share/libtool/lt__argz.c
-cross/share/libtool/lt__dirent.c
-cross/share/libtool/lt__strl.c
-cross/share/libtool/lt_dlloader.c
-cross/share/libtool/lt_error.c
-cross/share/libtool/ltdl.c
-cross/share/libtool/ltdl.h
-cross/share/libtool/ltdl.mk
-cross/share/libtool/slist.c
+@comment $NetBSD: PLIST,v 1.3 2019/07/09 15:45:25 riastradh Exp $
+cross-${MACHINE_ARCH}/bin/libtool
+cross-${MACHINE_ARCH}/bin/libtoolize
+cross-${MACHINE_ARCH}/bin/shlibtool
+cross-${MACHINE_ARCH}/man/man1/libtool.1
+cross-${MACHINE_ARCH}/man/man1/libtoolize.1
+cross-${MACHINE_ARCH}/share/aclocal/libtool.m4
+cross-${MACHINE_ARCH}/share/aclocal/ltargz.m4
+cross-${MACHINE_ARCH}/share/aclocal/ltdl.m4
+cross-${MACHINE_ARCH}/share/aclocal/ltoptions.m4
+cross-${MACHINE_ARCH}/share/aclocal/ltsugar.m4
+cross-${MACHINE_ARCH}/share/aclocal/ltversion.m4
+cross-${MACHINE_ARCH}/share/aclocal/lt~obsolete.m4
+cross-${MACHINE_ARCH}/share/libtool/COPYING.LIB
+cross-${MACHINE_ARCH}/share/libtool/Makefile.am
+cross-${MACHINE_ARCH}/share/libtool/Makefile.in
+cross-${MACHINE_ARCH}/share/libtool/README
+cross-${MACHINE_ARCH}/share/libtool/aclocal.m4
+cross-${MACHINE_ARCH}/share/libtool/build-aux/compile
+cross-${MACHINE_ARCH}/share/libtool/build-aux/config.guess
+cross-${MACHINE_ARCH}/share/libtool/build-aux/config.sub
+cross-${MACHINE_ARCH}/share/libtool/build-aux/depcomp
+cross-${MACHINE_ARCH}/share/libtool/build-aux/install-sh
+cross-${MACHINE_ARCH}/share/libtool/build-aux/ltmain.sh
+cross-${MACHINE_ARCH}/share/libtool/build-aux/missing
+cross-${MACHINE_ARCH}/share/libtool/config-h.in
+cross-${MACHINE_ARCH}/share/libtool/configure
+cross-${MACHINE_ARCH}/share/libtool/configure.ac
+cross-${MACHINE_ARCH}/share/libtool/libltdl/lt__alloc.h
+cross-${MACHINE_ARCH}/share/libtool/libltdl/lt__argz_.h
+cross-${MACHINE_ARCH}/share/libtool/libltdl/lt__dirent.h
+cross-${MACHINE_ARCH}/share/libtool/libltdl/lt__glibc.h
+cross-${MACHINE_ARCH}/share/libtool/libltdl/lt__private.h
+cross-${MACHINE_ARCH}/share/libtool/libltdl/lt__strl.h
+cross-${MACHINE_ARCH}/share/libtool/libltdl/lt_dlloader.h
+cross-${MACHINE_ARCH}/share/libtool/libltdl/lt_error.h
+cross-${MACHINE_ARCH}/share/libtool/libltdl/lt_system.h
+cross-${MACHINE_ARCH}/share/libtool/libltdl/slist.h
+cross-${MACHINE_ARCH}/share/libtool/loaders/dld_link.c
+cross-${MACHINE_ARCH}/share/libtool/loaders/dlopen.c
+cross-${MACHINE_ARCH}/share/libtool/loaders/dyld.c
+cross-${MACHINE_ARCH}/share/libtool/loaders/load_add_on.c
+cross-${MACHINE_ARCH}/share/libtool/loaders/loadlibrary.c
+cross-${MACHINE_ARCH}/share/libtool/loaders/preopen.c
+cross-${MACHINE_ARCH}/share/libtool/loaders/shl_load.c
+cross-${MACHINE_ARCH}/share/libtool/lt__alloc.c
+cross-${MACHINE_ARCH}/share/libtool/lt__argz.c
+cross-${MACHINE_ARCH}/share/libtool/lt__dirent.c
+cross-${MACHINE_ARCH}/share/libtool/lt__strl.c
+cross-${MACHINE_ARCH}/share/libtool/lt_dlloader.c
+cross-${MACHINE_ARCH}/share/libtool/lt_error.c
+cross-${MACHINE_ARCH}/share/libtool/ltdl.c
+cross-${MACHINE_ARCH}/share/libtool/ltdl.h
+cross-${MACHINE_ARCH}/share/libtool/ltdl.mk
+cross-${MACHINE_ARCH}/share/libtool/slist.c
diff -r d3b4014e0029 -r d361457f9bd3 doc/HOWTO-use-crosscompile
--- a/doc/HOWTO-use-crosscompile        Tue Jul 09 15:38:23 2019 +0000
+++ b/doc/HOWTO-use-crosscompile        Tue Jul 09 15:45:25 2019 +0000
@@ -1,7 +1,7 @@
 Cross-compilation in pkgsrc (user's guide)              -*- outline -*-
 Taylor R. Campbell <riastradh%NetBSD.org@localhost>
 
-$NetBSD: HOWTO-use-crosscompile,v 1.5 2017/03/05 10:36:40 kamil Exp $
+$NetBSD: HOWTO-use-crosscompile,v 1.6 2019/07/09 15:45:25 riastradh Exp $
 
 The following steps enable you to build binary packages for a machine
 architecture other than the one you are building on.  For example, you
@@ -40,11 +40,6 @@
    # which is a bug.
    USE_CROSS_COMPILE?=  yes
 
-   # This is a kludge for cross-libtool.
-   #
-   # XXX Should not need this.
-   CROSSBASE=           ${LOCALBASE}/cross-${TARGET_ARCH:U${MACHINE_ARCH}}
-
    .if !empty(USE_CROSS_COMPILE:M[yY][eE][sS])
    # Specify the machine architecture of target packages.
    #
diff -r d3b4014e0029 -r d361457f9bd3 mk/bsd.pkg.use.mk
--- a/mk/bsd.pkg.use.mk Tue Jul 09 15:38:23 2019 +0000
+++ b/mk/bsd.pkg.use.mk Tue Jul 09 15:45:25 2019 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: bsd.pkg.use.mk,v 1.67 2018/01/02 05:49:44 maya Exp $
+#      $NetBSD: bsd.pkg.use.mk,v 1.68 2019/07/09 15:45:25 riastradh Exp $
 #
 # Turn USE_* macros into proper depedency logic.  Included near the top of
 # bsd.pkg.mk, after bsd.prefs.mk.
@@ -86,8 +86,8 @@
 .  endif
 .else
 .  if !empty(USE_CROSS_COMPILE:M[yY][eE][sS])
-PKG_LIBTOOL?=          ${CROSSBASE}/bin/libtool
-PKG_SHLIBTOOL?=                ${CROSSBASE}/bin/shlibtool
+PKG_LIBTOOL?=          ${LOCALBASE}/cross-${TARGET_ARCH:U${MACHINE_ARCH}}/bin/libtool
+PKG_SHLIBTOOL?=                ${LOCALBASE}/cross-${TARGET_ARCH:U${MACHINE_ARCH}}/bin/shlibtool
 .  else
 PKG_LIBTOOL?=          ${LOCALBASE}/bin/libtool
 PKG_SHLIBTOOL?=                ${LOCALBASE}/bin/shlibtool
Prev by Date: [pkgsrc/trunk]: pkgsrc/graphics/grafx2 grafx2: Needs pkg-config.
Next by Date: [pkgsrc/trunk]: pkgsrc/doc Note that USE_CWRAPPERS=no is needed for now in cr...
Previous by Thread: [pkgsrc/trunk]: pkgsrc/graphics/grafx2 grafx2: Needs pkg-config.
Next by Thread: [pkgsrc/trunk]: pkgsrc/doc Note that USE_CWRAPPERS=no is needed for now in cr...
Indexes:
Home | Main Index | Thread Index | Old Index