CVS commit: pkgsrc/cross

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Sun Jun 19 16:19:04 UTC 2016

Added Files:
        pkgsrc/cross/cross-libtool-base: DESCR Makefile PLIST
Removed Files:
        pkgsrc/cross/libtool-base: DESCR Makefile

Log Message:
Move libtool-base to cross-libtool-base to make PKGNAME match directory name.

Convert away from USE_CROSSBASE to plain ${PREFIX}/cross.


To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 pkgsrc/cross/cross-libtool-base/DESCR \
    pkgsrc/cross/cross-libtool-base/Makefile \
    pkgsrc/cross/cross-libtool-base/PLIST
cvs rdiff -u -r1.1 -r0 pkgsrc/cross/libtool-base/DESCR
cvs rdiff -u -r1.4 -r0 pkgsrc/cross/libtool-base/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Added files:

Index: pkgsrc/cross/cross-libtool-base/DESCR
diff -u /dev/null pkgsrc/cross/cross-libtool-base/DESCR:1.1
--- /dev/null   Sun Jun 19 16:19:04 2016
+++ pkgsrc/cross/cross-libtool-base/DESCR       Sun Jun 19 16:19:04 2016
@@ -0,0 +1,10 @@
+This is GNU Libtool, a generic library support script.  Libtool hides
+the complexity of using shared libraries behind a consistent, portable
+interface.
+
+To use libtool, add the new generic library building commands to your
+Makefile, Makefile.in, or Makefile.am.
+
+This package includes the libtool script and support files.
+
+This is the cross-compilation version of libtool.
Index: pkgsrc/cross/cross-libtool-base/Makefile
diff -u /dev/null pkgsrc/cross/cross-libtool-base/Makefile:1.1
--- /dev/null   Sun Jun 19 16:19:04 2016
+++ pkgsrc/cross/cross-libtool-base/Makefile    Sun Jun 19 16:19:04 2016
@@ -0,0 +1,89 @@
+# $NetBSD: Makefile,v 1.1 2016/06/19 16:19:04 wiz Exp $
+
+# XXX This is kludgerific copypasta of devel/libtool-base/Makefile for
+# cross-compilation.  Please make it go away!
+
+###########################################################################
+###########################################################################
+#
+# HEADS UP!  DO NOT CHANGE THE VERSION OR PKGREVISION WITHOUT READING THIS:
+#
+###########################################################################
+###########################################################################
+#
+# This package is maintained specially in order to preserve pkgsrc
+# specific OS changes that diverge from the "out of the box" libtool.
+# In order to keep this package in a maintainable condition, the .m4 files
+# must be manipulated in order to generate the patch-* files.
+#
+# See devel/libtool/patches/manual.README for instructions on how to make
+# 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.
+#
+###########################################################################
+###########################################################################
+
+.include "../../devel/libtool/Makefile.common"
+
+# XXX Tweaked for cross-compilation.
+#PKGNAME=      ${DISTNAME:S/-/-base-/}
+PKGNAME=       ${DISTNAME:S/^libtool-/cross-libtool-base-${MACHINE_ARCH}-/}
+PKGREVISION=   2
+
+COMMENT=       Generic shared library support script (the script itself)
+
+CONFLICTS+=    libtool<=1.3.5nb11
+
+TEST_TARGET=   check
+
+OVERRIDE_DIRDEPTH.install-sh=  1
+
+# Always build libraries and executables that use the runtime linker.
+# in addition, disable libtool locking, as the test is broken on AIX,
+# and results in files being locked indefinitely.
+LDFLAGS.AIX+=          -Wl,-brtl
+CONFIGURE_ARGS.AIX+=   --disable-libtool-lock
+
+# The MIPSpro compiler doesn't support -c with -o, but the locking
+# workaround is itself broken.  Disable it unconditionally.
+CONFIGURE_ARGS.IRIX+=  --disable-libtool-lock
+
+CFLAGS.SunOS+= ${_COMPILER_ABI_FLAG.${ABI}}
+
+# We are going to want libtool to find the same versions of the C, C++,
+# and Fortran compilers.
+#
+USE_LANGUAGES=         c c++
+GNU_CONFIGURE_PREFIX=  ${PREFIX}/cross
+CONFIGURE_ARGS+=       --disable-ltdl-install
+
+USE_TOOLS+=            echo
+
+# XXX Added for cross-compilation.
+FILESDIR=      ../../devel/libtool-base/files
+
+.PHONY: fix-libtool
+fix-libtool:
+       cd ${WRKSRC}; for f in libtool; do                              \
+               ${SED}  -e "s,-L${BUILDLINK_DIR}/lib,," $$f > $$f.new;  \
+               if [ -x $$f ]; then ${CHMOD} +x $$f.new; fi;            \
+               ${MV} -f $$f.new $$f;                                   \
+       done
+
+post-build: fix-libtool
+
+post-build:
+       @${SED} -e "s|@PREFIX@|"${PREFIX:Q}"|g"                         \
+               -e "s|@SH@|"${SH:Q}"|g"                                 \
+               ${FILESDIR}/shlibtool.in > ${WRKSRC}/shlibtool
+
+post-install:
+       ${INSTALL_SCRIPT} ${WRKSRC}/shlibtool ${DESTDIR}${PREFIX}/cross/bin/shlibtool
+
+BUILDLINK_DEPMETHOD.dlcompat=  build
+
+.include "../../mk/dlopen.buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/cross/cross-libtool-base/PLIST
diff -u /dev/null pkgsrc/cross/cross-libtool-base/PLIST:1.1
--- /dev/null   Sun Jun 19 16:19:04 2016
+++ pkgsrc/cross/cross-libtool-base/PLIST       Sun Jun 19 16:19:04 2016
@@ -0,0 +1,55 @@
+@comment $NetBSD: PLIST,v 1.1 2016/06/19 16:19:04 wiz Exp $
+cross/bin/libtool
+cross/bin/libtoolize
+cross/bin/shlibtool
+cross/man/man1/libtool.1
+cross/man/man1/libtoolize.1
+cross/share/aclocal/argz.m4
+cross/share/aclocal/libtool.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/config/compile
+cross/share/libtool/config/config.guess
+cross/share/libtool/config/config.sub
+cross/share/libtool/config/depcomp
+cross/share/libtool/config/install-sh
+cross/share/libtool/config/ltmain.sh
+cross/share/libtool/config/missing
+cross/share/libtool/libltdl/COPYING.LIB
+cross/share/libtool/libltdl/Makefile.am
+cross/share/libtool/libltdl/Makefile.in
+cross/share/libtool/libltdl/Makefile.inc
+cross/share/libtool/libltdl/README
+cross/share/libtool/libltdl/aclocal.m4
+cross/share/libtool/libltdl/argz.c
+cross/share/libtool/libltdl/argz_.h
+cross/share/libtool/libltdl/config-h.in
+cross/share/libtool/libltdl/configure
+cross/share/libtool/libltdl/configure.ac
+cross/share/libtool/libltdl/libltdl/lt__alloc.h
+cross/share/libtool/libltdl/libltdl/lt__dirent.h
+cross/share/libtool/libltdl/libltdl/lt__glibc.h
+cross/share/libtool/libltdl/libltdl/lt__private.h
+cross/share/libtool/libltdl/libltdl/lt__strl.h
+cross/share/libtool/libltdl/libltdl/lt_dlloader.h
+cross/share/libtool/libltdl/libltdl/lt_error.h
+cross/share/libtool/libltdl/libltdl/lt_system.h
+cross/share/libtool/libltdl/libltdl/slist.h
+cross/share/libtool/libltdl/loaders/dld_link.c
+cross/share/libtool/libltdl/loaders/dlopen.c
+cross/share/libtool/libltdl/loaders/dyld.c
+cross/share/libtool/libltdl/loaders/load_add_on.c
+cross/share/libtool/libltdl/loaders/loadlibrary.c
+cross/share/libtool/libltdl/loaders/preopen.c
+cross/share/libtool/libltdl/loaders/shl_load.c
+cross/share/libtool/libltdl/lt__alloc.c
+cross/share/libtool/libltdl/lt__dirent.c
+cross/share/libtool/libltdl/lt__strl.c
+cross/share/libtool/libltdl/lt_dlloader.c
+cross/share/libtool/libltdl/lt_error.c
+cross/share/libtool/libltdl/ltdl.c
+cross/share/libtool/libltdl/ltdl.h
+cross/share/libtool/libltdl/slist.c