diff options
| author | abs <abs@pkgsrc.org> | 2012-05-08 09:24:15 +0000 |
|---|---|---|
| committer | abs <abs@pkgsrc.org> | 2012-05-08 09:24:15 +0000 |
| commit | e0783e23cc6b279b33096bc716934c410c485284 (patch) | |
| tree | 2e18f5d6cf1acf1da244af3248768c6671cb6298 /lang | |
| parent | 354fc6aed1e2ed047159ace502c8f05db81c9749 (diff) | |
| download | pkgsrc-e0783e23cc6b279b33096bc716934c410c485284.tar.gz | |
Add a hacks.mk to avoid issues with internal/external libjpeg mismatches. Bump pkgrevision
Diffstat (limited to 'lang')
| -rw-r--r-- | lang/openjdk7/Makefile | 4 | ||||
| -rw-r--r-- | lang/openjdk7/hacks.mk | 15 |
2 files changed, 17 insertions, 2 deletions
diff --git a/lang/openjdk7/Makefile b/lang/openjdk7/Makefile index 74f0270d32e..700e7ca389b 100644 --- a/lang/openjdk7/Makefile +++ b/lang/openjdk7/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.31 2012/05/04 16:25:59 joerg Exp $ +# $NetBSD: Makefile,v 1.32 2012/05/08 09:24:15 abs Exp $ DISTNAME= openjdk-7-fcs-src-b147-27_jun_2011 PKGNAME= openjdk7-1.7.0.147.20110811 -PKGREVISION= 2 +PKGREVISION= 3 CATEGORIES= lang MASTER_SITES= ${MASTER_SITE_LOCAL:=openjdk7/} EXTRACT_SUFX= .tar.bz2 diff --git a/lang/openjdk7/hacks.mk b/lang/openjdk7/hacks.mk new file mode 100644 index 00000000000..54d8136ebd0 --- /dev/null +++ b/lang/openjdk7/hacks.mk @@ -0,0 +1,15 @@ +# $NetBSD: hacks.mk,v 1.1 2012/05/08 09:24:15 abs Exp $ + +.if !defined(OPENJDK7_HACKS_MK) +OPENJDK7_HACKS_MK= # empty + +### Ensure we do not pickup external jpeg includes: openjdk uses an internal +### libjpeg with potentially conflicting defines, which breaks at least +### libjpeg-turbo +post-wrapper: + ${RM} -f ${BUILDLINK_DIR}/include/jconfig.h + ${RM} -f ${BUILDLINK_DIR}/include/jerror.h + ${RM} -f ${BUILDLINK_DIR}/include/jmorecfg.h + ${RM} -f ${BUILDLINK_DIR}/include/jpeglib.h + +.endif |