diff options
| author | jperkin <jperkin@pkgsrc.org> | 2015-04-27 19:24:17 +0000 |
|---|---|---|
| committer | jperkin <jperkin@pkgsrc.org> | 2015-04-27 19:24:17 +0000 |
| commit | 2ed79e7a63b15d9d2a95024e69082f506778d1b7 (patch) | |
| tree | 1a81b0e5c072f3462b20e61eef87875fbe534b47 /lang/openjdk7/patches | |
| parent | 1018815ecf509c5aa153160dd9ce4fea01e0d5b4 (diff) | |
| download | pkgsrc-2ed79e7a63b15d9d2a95024e69082f506778d1b7.tar.gz | |
Find iconv and zlib correctly. Problem masked by legacy wrappers, and
not seen with cwrappers due to the package specifically using the legacy
wrappers through accidental WRAPPER_DIR usage. The latter will be fixed
in upcoming infrastructure changes.
Diffstat (limited to 'lang/openjdk7/patches')
3 files changed, 6 insertions, 6 deletions
diff --git a/lang/openjdk7/patches/patch-jdk_make_java_instrument_Makefile b/lang/openjdk7/patches/patch-jdk_make_java_instrument_Makefile index 8f4cdf65e0f..d7b906c3de7 100644 --- a/lang/openjdk7/patches/patch-jdk_make_java_instrument_Makefile +++ b/lang/openjdk7/patches/patch-jdk_make_java_instrument_Makefile @@ -1,4 +1,4 @@ -$NetBSD: patch-jdk_make_java_instrument_Makefile,v 1.2 2014/01/02 01:16:35 ryoon Exp $ +$NetBSD: patch-jdk_make_java_instrument_Makefile,v 1.3 2015/04/27 19:24:17 jperkin Exp $ Need libiconv. @@ -18,7 +18,7 @@ Need libiconv. ifeq ($(PLATFORM), solaris) LDFLAGS += -R \$$ORIGIN/jli + ifeq ($(CC_VERSION), gcc) -+ OTHER_LDLIBS += -liconv ++ OTHER_LDLIBS += -L${BUILDLINK_PREFIX.iconv}/lib -liconv + endif endif ifeq ($(PLATFORM), linux) diff --git a/lang/openjdk7/patches/patch-jdk_make_java_npt_Makefile b/lang/openjdk7/patches/patch-jdk_make_java_npt_Makefile index 642c41c2db5..32de427806a 100644 --- a/lang/openjdk7/patches/patch-jdk_make_java_npt_Makefile +++ b/lang/openjdk7/patches/patch-jdk_make_java_npt_Makefile @@ -1,4 +1,4 @@ -$NetBSD: patch-jdk_make_java_npt_Makefile,v 1.2 2014/01/02 01:16:35 ryoon Exp $ +$NetBSD: patch-jdk_make_java_npt_Makefile,v 1.3 2015/04/27 19:24:17 jperkin Exp $ GCC needs libiconv. @@ -10,7 +10,7 @@ GCC needs libiconv. +ifeq ($(PLATFORM), solaris) + ifeq ($(CC_VERSION), gcc) -+ OTHER_LDLIBS += -liconv ++ OTHER_LDLIBS += -L${BUILDLINK_PREFIX.iconv}/lib -liconv + endif # CC_VERSION +endif # PLATFORM + diff --git a/lang/openjdk7/patches/patch-jdk_make_sun_splashscreen_Makefile b/lang/openjdk7/patches/patch-jdk_make_sun_splashscreen_Makefile index d78c1ccaed8..1861f5b99bf 100644 --- a/lang/openjdk7/patches/patch-jdk_make_sun_splashscreen_Makefile +++ b/lang/openjdk7/patches/patch-jdk_make_sun_splashscreen_Makefile @@ -1,4 +1,4 @@ -$NetBSD: patch-jdk_make_sun_splashscreen_Makefile,v 1.1 2013/06/15 09:31:06 jperkin Exp $ +$NetBSD: patch-jdk_make_sun_splashscreen_Makefile,v 1.2 2015/04/27 19:24:17 jperkin Exp $ GCC support. @@ -10,7 +10,7 @@ GCC support. endif + ifeq ($(PLATFORM), solaris) + ifeq ($(CC_VERSION), gcc) -+ OTHER_LDLIBS += -liconv ++ OTHER_LDLIBS += -L${BUILDLINK_PREFIX.iconv}/lib -liconv + endif + endif CPPFLAGS += -I$(OPENWIN_HOME)/include -I$(OPENWIN_HOME)/include/X11/extensions |