summaryrefslogtreecommitdiff
path: root/archivers
diff options
context:
space:
mode:
authorsalo <salo@pkgsrc.org>2004-07-10 17:39:50 +0000
committersalo <salo@pkgsrc.org>2004-07-10 17:39:50 +0000
commit38aab826dd6e6a78eb4025d4c07abd0d8d052fe3 (patch)
tree2a6f6cf863022f1c08f3a18940a726095d344452 /archivers
parent06ca465236c544fd7f378619ae20d7e3e2d9c7cb (diff)
downloadpkgsrc-38aab826dd6e6a78eb4025d4c07abd0d8d052fe3.tar.gz
Use GNU ld specific script only when GNU ld is used.
Fixes build on Solaris with native linker.
Diffstat (limited to 'archivers')
-rw-r--r--archivers/arj/Makefile3
-rw-r--r--archivers/arj/distinfo4
-rw-r--r--archivers/arj/patches/patch-ab39
3 files changed, 37 insertions, 9 deletions
diff --git a/archivers/arj/Makefile b/archivers/arj/Makefile
index cd22d89b96a..d28a72805c8 100644
--- a/archivers/arj/Makefile
+++ b/archivers/arj/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2004/04/27 17:16:28 tv Exp $
+# $NetBSD: Makefile,v 1.10 2004/07/10 17:39:50 salo Exp $
# FreeBSD Id: ports/archivers/arj/Makefile,v 1.2 2002/09/17 05:17:29 ijliao Exp
DISTNAME= arj-3.10.20
@@ -18,6 +18,7 @@ GNU_CONFIGURE= yes
CONFIGURE_SCRIPT= ${WRKSRC}/gnu/configure
MAKEFILE= makefile.gnu
MAKE_FLAGS+= INSTALL_DIR=${INSTALL_PROGRAM_DIR:Q}
+CONFIGURE_ENV+= LD=${LD:Q}
INSTALL_UNSTRIPPED= yes # $LOCALBASE/bin/arj must have symbol table
ARJ_DOCSDIR= ${PREFIX}/share/doc/arj
diff --git a/archivers/arj/distinfo b/archivers/arj/distinfo
index a5ed7922a4b..6bbb0dfa344 100644
--- a/archivers/arj/distinfo
+++ b/archivers/arj/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.4 2004/04/27 17:16:28 tv Exp $
+$NetBSD: distinfo,v 1.5 2004/07/10 17:39:50 salo Exp $
SHA1 (arj-3.10.20.tar.gz) = ce818c8127d11efac469c65a9f65572be7e07a5a
Size (arj-3.10.20.tar.gz) = 428054 bytes
SHA1 (patch-aa) = 627dfb018aad8c624c5c88e4f4fdb39bee159b36
-SHA1 (patch-ab) = f5bf9af0bc17ac0bda05d5884d5ef32863dc70ab
+SHA1 (patch-ab) = c588776f9b8e2331471be07e6acd3b873af84fbc
SHA1 (patch-ac) = 4e557fa98bc92e033d11e2e9a8e34127275f7f72
diff --git a/archivers/arj/patches/patch-ab b/archivers/arj/patches/patch-ab
index 51f973daaf4..bb17c0dad53 100644
--- a/archivers/arj/patches/patch-ab
+++ b/archivers/arj/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.3 2004/04/27 17:16:28 tv Exp $
+$NetBSD: patch-ab,v 1.4 2004/07/10 17:39:50 salo Exp $
---- gnu/configure.in.orig Sat Apr 17 07:28:06 2004
-+++ gnu/configure.in
-@@ -12,7 +12,7 @@ dnl Installation script (let it be, temp
+--- gnu/configure.in.orig Sat Apr 17 13:28:06 2004
++++ gnu/configure.in Sat Jul 10 19:24:37 2004
+@@ -12,7 +12,7 @@
AC_PROG_INSTALL([e:/os2apps/autoconf/install-sh])
dnl Configuration parameters
@@ -11,7 +11,24 @@ $NetBSD: patch-ab,v 1.3 2004/04/27 17:16:28 tv Exp $
dnl Checks for the canonical system name
AC_CANONICAL_HOST
-@@ -36,6 +36,7 @@ AC_FUNC_SETVBUF_REVERSED
+@@ -19,6 +19,16 @@
+
+ dnl Checks for programs.
+ AC_PROG_CC
++AC_DEFUN(AC_PROG_LD_GNU,
++[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], ac_cv_prog_gnu_ld,
++[# I'd rather use --version here, but apparently some GNU ld's only accept -v.
++if $LD -v 2>&1 </dev/null | egrep '(GNU|with BFD)' 1>&5; then
++ ac_cv_prog_gnu_ld=yes
++else
++ ac_cv_prog_gnu_ld=no
++fi])
++])
++AC_PROG_LD_GNU
+
+ dnl Checks for header files.
+ AC_HEADER_STDC
+@@ -36,6 +46,7 @@
AC_TYPE_SIGNAL
AC_FUNC_VPRINTF
AC_CHECK_FUNCS([getcwd min max mkdir mkdtemp rmdir fcloseall strcasecmp setpriority strdup strerror strstr strupr strlwr strtol strtoul])
@@ -19,7 +36,17 @@ $NetBSD: patch-ab,v 1.3 2004/04/27 17:16:28 tv Exp $
dnl Platform-specific tuning
PROG_EXT=
-@@ -115,7 +116,7 @@ dnl Initial setup
+@@ -68,7 +79,9 @@
+ CFLAGS="-DSUNOS -D_UNIX"
+ DLL_FLAGS="-shared -fPIC"
+ DLL_CFLAGS="-shared -fPIC"
++ if test X"$ac_cv_prog_gnu_ld" = X"yes"; then
+ LD_STRIP="gnu/stripgcc.lnk"
++ fi
+ ;;
+ os2*)
+ PROG_EXT=".exe"
+@@ -115,7 +128,7 @@
test -z "$CONFIG_SHELL" && CONFIG_SHELL=/bin/sh
AC_SUBST(CONFIG_SHELL)