diff options
| author | tv <tv@pkgsrc.org> | 2007-01-03 16:23:10 +0000 |
|---|---|---|
| committer | tv <tv@pkgsrc.org> | 2007-01-03 16:23:10 +0000 |
| commit | 397f89f8ea905281664d0312045c6dd5897a5890 (patch) | |
| tree | 571019ec039ac0ec85d81fa4c4fa8580fe8d76df /graphics | |
| parent | cbf063eee3c98695ec0af2e5b0ba182c73601713 (diff) | |
| download | pkgsrc-397f89f8ea905281664d0312045c6dd5897a5890.tar.gz | |
Don't allow "ld --version-script" on Interix. Fixes PR pkg/35210.
Based on patch idea from Aleksey Cheusov <cheusov@tut.by>.
(Sanity tested for breakage on a non-Interix platform, NetBSD.)
Diffstat (limited to 'graphics')
| -rw-r--r-- | graphics/png/Makefile | 3 | ||||
| -rw-r--r-- | graphics/png/buildlink3.mk | 9 | ||||
| -rw-r--r-- | graphics/png/distinfo | 3 | ||||
| -rw-r--r-- | graphics/png/patches/patch-ac | 13 |
4 files changed, 24 insertions, 4 deletions
diff --git a/graphics/png/Makefile b/graphics/png/Makefile index 5bd3ffd1657..fb25a727475 100644 --- a/graphics/png/Makefile +++ b/graphics/png/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.86 2006/11/30 10:58:17 drochner Exp $ +# $NetBSD: Makefile,v 1.87 2007/01/03 16:23:10 tv Exp $ DISTNAME= libpng-1.2.14 PKGNAME= ${DISTNAME:S/lib//} +PKGREVISION= 1 # temporary, distfile was changed after release DIST_SUBDIR= libpng-1.2.14-20061130 CATEGORIES= graphics diff --git a/graphics/png/buildlink3.mk b/graphics/png/buildlink3.mk index 282756ae95a..1227d18de48 100644 --- a/graphics/png/buildlink3.mk +++ b/graphics/png/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.17 2006/12/12 21:52:36 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.18 2007/01/03 16:23:10 tv Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ PNG_BUILDLINK3_MK:= ${PNG_BUILDLINK3_MK}+ @@ -12,7 +12,12 @@ BUILDLINK_PACKAGES+= png BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}png .if !empty(PNG_BUILDLINK3_MK:M+) -BUILDLINK_API_DEPENDS.png+= png>=1.2.4 +# XXX tv - remove this OPSYS block the next time ABI_DEPENDS is bumped: +.if ${OPSYS} == "Interix" +BUILDLINK_ABI_DEPENDS.png?= png>=1.2.14nb1 # fixes linkage bug +.endif + +BUILDLINK_API_DEPENDS.png+= png>=1.2.4 BUILDLINK_ABI_DEPENDS.png?= png>=1.2.9nb2 BUILDLINK_PKGSRCDIR.png?= ../../graphics/png diff --git a/graphics/png/distinfo b/graphics/png/distinfo index 518fa9bef45..9517e974bcd 100644 --- a/graphics/png/distinfo +++ b/graphics/png/distinfo @@ -1,8 +1,9 @@ -$NetBSD: distinfo,v 1.34 2006/11/30 10:58:18 drochner Exp $ +$NetBSD: distinfo,v 1.35 2007/01/03 16:23:10 tv Exp $ SHA1 (libpng-1.2.14-20061130/libpng-1.2.14.tar.bz2) = 3cf3efcada7896982b165ea34ed6b399ef7fb4af RMD160 (libpng-1.2.14-20061130/libpng-1.2.14.tar.bz2) = 37c91bc411a8c4bc467bb8b229a4e39bcca4bd8a Size (libpng-1.2.14-20061130/libpng-1.2.14.tar.bz2) = 620379 bytes SHA1 (patch-aa) = 4b6437906e6f2f644c731a293859e64f69300bb0 SHA1 (patch-ab) = 979175c65587686b339a5556e8bcae3be95a07ca +SHA1 (patch-ac) = 87850d6ac555f1d8863a96d287a1ccccfa89230b SHA1 (patch-ae) = b9bf9de3caa32ac78a17685cdd5df5b80d1ccbbf diff --git a/graphics/png/patches/patch-ac b/graphics/png/patches/patch-ac new file mode 100644 index 00000000000..a832b07c81a --- /dev/null +++ b/graphics/png/patches/patch-ac @@ -0,0 +1,13 @@ +$NetBSD: patch-ac,v 1.6 2007/01/03 16:23:10 tv Exp $ + +--- configure.orig 2006-11-28 11:26:14.000000000 -0500 ++++ configure +@@ -21341,7 +21341,7 @@ fi + { echo "$as_me:$LINENO: checking if libraries can be versioned" >&5 + echo $ECHO_N "checking if libraries can be versioned... $ECHO_C" >&6; } + GLD=`$LD --help < /dev/null 2>/dev/null | grep version-script` +-if test "$GLD"; then ++if test "$GLD" && test "`uname -s`" != "Interix"; then + have_ld_version_script=yes + { echo "$as_me:$LINENO: result: yes" >&5 + echo "${ECHO_T}yes" >&6; } |