summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.gitignore1
-rw-r--r--jtools/Makefile2
-rw-r--r--jtools/cacao/Makefile35
-rw-r--r--jtools/jamvm/Makefile37
-rw-r--r--mk/build.mk10
-rw-r--r--mk/buildhlp.mk4
-rw-r--r--mk/pkg-bottom.mk5
-rw-r--r--mk/vars.mk2
-rw-r--r--package/alsa-lib/Makefile2
-rw-r--r--package/giflib/Makefile24
-rw-r--r--package/libXinerama/Makefile37
-rw-r--r--package/libXp/Makefile35
-rw-r--r--package/libXtst/Makefile37
-rw-r--r--package/openjdk/Makefile50
-rw-r--r--package/openjdk/patches/patch-icedtea6-1_10_Makefile_in2
-rw-r--r--package/openjdk/patches/patch-icedtea6-1_10_configure479
-rw-r--r--package/perl/patches/patch-Configure65
-rw-r--r--package/printproto/Makefile25
-rw-r--r--package/python2/Makefile1
-rw-r--r--package/python2/files/posixmodule.c9365
-rw-r--r--package/python2/patches/patch-Modules_posixmodule_c16
-rw-r--r--package/xineramaproto/Makefile25
22 files changed, 9655 insertions, 604 deletions
diff --git a/.gitignore b/.gitignore
index 2562c1b7a..51956e85e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -45,6 +45,7 @@
/jtools_build/
/extra/
/.menu
+/.adkinit
/target/*/Config.in.systems
/target/*/sys-enabled
/target/packages/pkg-enabled
diff --git a/jtools/Makefile b/jtools/Makefile
index 932cd298f..23c90534f 100644
--- a/jtools/Makefile
+++ b/jtools/Makefile
@@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk
TARGETS:=
ifneq ($(ADK_PACKAGE_OPENJDK),)
-TARGETS+=fastjar gcj classpath jamvm ecj
+TARGETS+=fastjar gcj classpath ecj
endif
TARGETS_INSTALL:=$(patsubst %,%-install,$(TARGETS))
diff --git a/jtools/cacao/Makefile b/jtools/cacao/Makefile
deleted file mode 100644
index 6d4b76d1f..000000000
--- a/jtools/cacao/Makefile
+++ /dev/null
@@ -1,35 +0,0 @@
-# This file is part of the OpenADK project. OpenADK is copyrighted
-# material, please see the LICENCE file in the top-level directory.
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:= cacao
-PKG_VERSION:= 0.99.4
-PKG_RELEASE:= 1
-PKG_MD5SUM:= 63220327925ace13756ae334c55a3baa
-PKG_SITES:= http://www.complang.tuwien.ac.at/cacaojvm/download/cacao-0.99.4/
-
-DISTFILES:= $(PKG_NAME)-$(PKG_VERSION).tar.bz2
-
-include ../rules.mk
-
-install: ${STAGING_HOST_DIR}/usr/bin/cacao
-
-$(WRKBUILD)/.configured: ${WRKDIST}/.prepared
- (cd $(WRKBUILD); ./configure --prefix=/usr --disable-libjvm --enable-debug \
- --with-vm-zip=$(STAGING_HOST_DIR)/usr/share/cacao/vm.zip \
- --with-java-runtime-library=gnuclasspath \
- --with-java-runtime-library-classes=$(STAGING_HOST_DIR)/usr/share/classpath/glibj.zip \
- --with-java-runtime-library-prefix=$(STAGING_HOST_DIR)/usr \
- --with-jni_md_h=$(STAGING_HOST_DIR)/usr/include \
- );
- touch $@
-
-$(WRKBUILD)/.compiled: ${WRKDIST}/.configured
- ${MAKE} -C ${WRKBUILD} $(MAKE_TRACE)
- touch $@
-
-${STAGING_HOST_DIR}/usr/bin/cacao: $(WRKBUILD)/.compiled
- ${MAKE} -C ${WRKBUILD} DESTDIR=$(STAGING_HOST_DIR) install $(MAKE_TRACE)
-
-include $(TOPDIR)/mk/tools.mk
diff --git a/jtools/jamvm/Makefile b/jtools/jamvm/Makefile
deleted file mode 100644
index 639b7d875..000000000
--- a/jtools/jamvm/Makefile
+++ /dev/null
@@ -1,37 +0,0 @@
-# This file is part of the OpenADK project. OpenADK is copyrighted
-# material, please see the LICENCE file in the top-level directory.
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:= jamvm
-PKG_VERSION:= 1.5.4
-PKG_RELEASE:= 1
-PKG_MD5SUM:= 63220327925ace13756ae334c55a3baa
-PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=jamvm/}
-
-ifeq (Darwin,${OStype})
-CC_FOR_BUILD:=${CC_FOR_BUILD} -m32
-CXX_FOR_BUILD:=${CXX_FOR_BUILD} -m32
-endif
-
-include ../rules.mk
-
-install: ${STAGING_JAVA_HOST_DIR}/usr/bin/jamvm
-
-$(WRKBUILD)/.configured: ${WRKDIST}/.prepared
- cd $(WRKBUILD); env \
- CC='${CC_FOR_BUILD}' \
- CXX='${CXX_FOR_BUILD}' \
- ./configure \
- --prefix=/usr \
- --with-classpath-install-dir=$(STAGING_JAVA_HOST_DIR)
- touch $@
-
-$(WRKBUILD)/.compiled: ${WRKDIST}/.configured
- ${MAKE} -C ${WRKBUILD} $(MAKE_TRACE)
- touch $@
-
-${STAGING_JAVA_HOST_DIR}/usr/bin/jamvm: $(WRKBUILD)/.compiled
- ${MAKE} -C ${WRKBUILD} DESTDIR=$(STAGING_JAVA_HOST_DIR) install $(MAKE_TRACE)
-
-include $(TOPDIR)/mk/tools.mk
diff --git a/mk/build.mk b/mk/build.mk
index 7f1d49838..ae0806669 100644
--- a/mk/build.mk
+++ b/mk/build.mk
@@ -234,7 +234,7 @@ cleandir:
rm -rf $(BUILD_DIR_PFX) $(BIN_DIR_PFX) $(TARGET_DIR_PFX) \
${TOPDIR}/package/pkglist.d ${TOPDIR}/package/pkgconfigs.d
rm -rf $(TOOLCHAIN_BUILD_DIR_PFX) $(STAGING_HOST_DIR_PFX) $(TOOLS_BUILD_DIR)
- rm -rf $(STAGING_TARGET_DIR_PFX) $(STAGING_PKG_DIR_PFX)
+ rm -rf $(STAGING_TARGET_DIR_PFX) $(STAGING_PKG_DIR_PFX) $(JTOOLS_BUILD_DIR) $(STAGING_JAVA_HOST_DIR)
rm -f .menu .tmpconfig.h .rebuild* ${TOPDIR}/package/Depends.mk ${TOPDIR}/prereq.mk
cleantarget:
@@ -248,9 +248,9 @@ distclean:
@$(TRACE) distclean
@$(MAKE) -C $(CONFIG) clean $(MAKE_TRACE)
@rm -rf $(BUILD_DIR_PFX) $(BIN_DIR_PFX) $(TARGET_DIR_PFX) $(DISTDIR) \
- ${TOPDIR}/package/pkglist.d ${TOPDIR}/package/pkgconfigs.d
+ ${TOPDIR}/package/pkglist.d ${TOPDIR}/package/pkgconfigs.d $(JTOOLS_BUILD_DIR)
@rm -rf $(TOOLCHAIN_BUILD_DIR_PFX) $(STAGING_HOST_DIR_PFX) $(TOOLS_BUILD_DIR)
- @rm -rf $(STAGING_TARGET_DIR_PFX) $(STAGING_PKG_DIR_PFX)
+ @rm -rf $(STAGING_TARGET_DIR_PFX) $(STAGING_PKG_DIR_PFX) $(STAGING_JAVA_HOST_DIR)
@rm -f .adkinit .config* .defconfig .tmpconfig.h all.config ${TOPDIR}/prereq.mk \
.menu ${TOPDIR}/package/Depends.mk .ADK_HAVE_DOT_CONFIG .rebuild.*
@@ -477,9 +477,9 @@ _mconfig2: ${CONFIG}/conf modconfig .menu
distclean:
@$(MAKE) -C $(CONFIG) clean
@rm -rf $(BUILD_DIR_PFX) $(BIN_DIR_PFX) $(TARGET_DIR_PFX) $(DISTDIR) \
- ${TOPDIR}/package/pkglist.d ${TOPDIR}/package/pkgconfigs.d
+ ${TOPDIR}/package/pkglist.d ${TOPDIR}/package/pkgconfigs.d $(JTOOLS_BUILD_DIR)
@rm -rf $(TOOLCHAIN_BUILD_DIR_PFX) $(STAGING_TARGET_DIR_PFX) $(TOOLS_BUILD_DIR)
- @rm -rf $(STAGING_HOST_DIR_PFX) $(STAGING_TARGET_DIR_PFX) $(STAGING_PKG_DIR_PFX)
+ @rm -rf $(STAGING_HOST_DIR_PFX) $(STAGING_TARGET_DIR_PFX) $(STAGING_PKG_DIR_PFX) $(STAGING_JAVA_HOST_DIR)
@rm -f .adkinit .config* .defconfig .tmpconfig.h all.config ${TOPDIR}/prereq.mk \
.menu .rebuild.* ${TOPDIR}/package/Depends.mk .ADK_HAVE_DOT_CONFIG
diff --git a/mk/buildhlp.mk b/mk/buildhlp.mk
index 2cb4f1714..3c79fc1e8 100644
--- a/mk/buildhlp.mk
+++ b/mk/buildhlp.mk
@@ -47,7 +47,11 @@ ${WRKDIST}/.extract_done: ${_CHECKSUM_COOKIE}
ifeq (${_CHECKSUM_COOKIE},)
rm -rf ${WRKDIST} ${WRKSRC} ${WRKBUILD}
endif
+ifeq ($(EXTRACT_OVERRIDE),1)
+ ${MAKE} do-extract
+else
${EXTRACT_CMD}
+endif
@${MAKE} post-extract $(MAKE_TRACE)
touch $@
diff --git a/mk/pkg-bottom.mk b/mk/pkg-bottom.mk
index ff7bd5638..49bae85f8 100644
--- a/mk/pkg-bottom.mk
+++ b/mk/pkg-bottom.mk
@@ -72,10 +72,7 @@ else ifeq ($(strip ${CONFIG_STYLE}),)
done;
cd ${WRKBUILD}; rm -f config.{cache,status}; \
env ${CONFIGURE_ENV} \
- ${BASH} ${WRKSRC}/${CONFIGURE_PROG} \
- --build=${GNU_HOST_NAME} \
- --host=${GNU_TARGET_NAME} \
- --target=${GNU_TARGET_NAME} \
+ ${BASH} ${WRKSRC}/${CONFIGURE_PROG} ${CONFIGURE_TRIPLE} \
--program-prefix= \
--program-suffix= \
--prefix=/usr \
diff --git a/mk/vars.mk b/mk/vars.mk
index ee5faec10..7d15e1bc3 100644
--- a/mk/vars.mk
+++ b/mk/vars.mk
@@ -50,9 +50,11 @@ GNU_TARGET_NAME= $(CPU_ARCH)-$(ADK_VENDOR)-linux
ifeq ($(ADK_NATIVE),y)
TARGET_CROSS:=
TARGET_COMPILER_PREFIX?=
+CONFIGURE_TRIPLE:=
else
TARGET_CROSS:= $(STAGING_HOST_DIR)/bin/$(REAL_GNU_TARGET_NAME)-
TARGET_COMPILER_PREFIX?=${TARGET_CROSS}
+CONFIGURE_TRIPLE:= --build=${GNU_HOST_NAME} --host=${GNU_TARGET_NAME} --target=${GNU_TARGET_NAME}
endif
ifneq ($(strip ${ADK_USE_CCACHE}),)
diff --git a/package/alsa-lib/Makefile b/package/alsa-lib/Makefile
index 7ea5606fa..cddbb0e69 100644
--- a/package/alsa-lib/Makefile
+++ b/package/alsa-lib/Makefile
@@ -34,5 +34,7 @@ alsa-lib-dev-install:
${INSTALL_DIR} ${IDIR_ALSA_LIB_DEV}/usr/include/{sys,alsa}
${CP} ${WRKINST}/usr/include/sys/*.h ${IDIR_ALSA_LIB_DEV}/usr/include/sys
${CP} ${WRKINST}/usr/include/alsa/*.h ${IDIR_ALSA_LIB_DEV}/usr/include/alsa
+ ${INSTALL_DIR} ${IDIR_ALSA_LIB_DEV}/usr/lib/pkgconfig
+ $(CP) $(WRKINST)/usr/lib/pkgconfig/*.pc ${IDIR_ALSA_LIB_DEV}/usr/lib/pkgconfig
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/giflib/Makefile b/package/giflib/Makefile
new file mode 100644
index 000000000..1259c92f9
--- /dev/null
+++ b/package/giflib/Makefile
@@ -0,0 +1,24 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:= giflib
+PKG_VERSION:= 4.1.6
+PKG_RELEASE:= 1
+PKG_MD5SUM:= 4ff2ecec336b9724c5190f06e8a40f9e
+PKG_DESCR:= GIF graphics library
+PKG_SECTION:= libs
+PKG_URL:= http://sourceforge.net/projects/giflib/
+PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=giflib/giflib%204.x/$(PKG_NAME)-$(PKG_VERSION)/}
+
+include $(TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,GIFLIB,giflib,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+
+giflib-install:
+ $(INSTALL_DIR) $(IDIR_GIFLIB)/usr/lib
+ $(INSTALL_BIN) $(WRKINST)/usr/lib/libgif.so* \
+ $(IDIR_GIFLIB)/usr/lib
+
+include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/libXinerama/Makefile b/package/libXinerama/Makefile
new file mode 100644
index 000000000..08b9a0ed0
--- /dev/null
+++ b/package/libXinerama/Makefile
@@ -0,0 +1,37 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:= libXinerama
+PKG_VERSION:= 1.1
+PKG_RELEASE:= 1
+PKG_MD5SUM:= 42b9fc01984c452ee416076c0977b0b3
+PKG_DESCR:= Xinerama library
+PKG_SECTION:= x11/libs
+PKG_BUILDDEP:= xineramaproto
+PKG_SITES:= ${MASTER_SITE_XORG}
+
+PKG_SUBPKGS:= LIBXINERAMA LIBXINERAMA_DEV
+PKGSD_LIBXINERAMA_DEV:= Xinerama headers
+PKGSC_LIBXINERAMA_DEV:= x11/devel
+
+include $(TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,LIBXINERAMA,libxinerama,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,LIBXINERAMA_DEV,libxinerama-dev,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBXINERAMA_DEV},${PKGSC_LIBXINERAMA_DEV}))
+
+CONFIGURE_ARGS+= --disable-malloc0returnsnull
+
+libxinerama-install:
+ ${INSTALL_DIR} ${IDIR_LIBXINERAMA}/usr/lib
+ ${CP} ${WRKINST}/usr/lib/libXinerama.so* ${IDIR_LIBXINERAMA}/usr/lib
+
+libxinerama-dev-install:
+ ${INSTALL_DIR} ${IDIR_LIBXINERAMA_DEV}/usr/include
+ ${CP} ${WRKINST}/usr/include/* ${IDIR_LIBXINERAMA_DEV}/usr/include
+ ${INSTALL_DIR} ${IDIR_LIBXINERAMA_DEV}/usr/lib/pkgconfig
+ ${INSTALL_DATA} ${WRKINST}/usr/lib/pkgconfig/*.pc \
+ ${IDIR_LIBXINERAMA_DEV}/usr/lib/pkgconfig
+
+include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/libXp/Makefile b/package/libXp/Makefile
new file mode 100644
index 000000000..d01c734a0
--- /dev/null
+++ b/package/libXp/Makefile
@@ -0,0 +1,35 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:= libXp
+PKG_VERSION:= 1.0.1
+PKG_RELEASE:= 1
+PKG_MD5SUM:= a960c831f11e6b4249fde78a5b969000
+PKG_DESCR:= X Print library
+PKG_SECTION:= x11/libs
+PKG_BUILDDEP:= libXext printproto
+PKG_SITES:= ${MASTER_SITE_XORG}
+
+PKG_SUBPKGS:= LIBXP LIBXP_DEV
+PKGSD_LIBXP_DEV:= X Print headers
+PKGSC_LIBXP_DEV:= x11/devel
+
+include $(TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,LIBXP,libpt,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,LIBXP_DEV,libpt-dev,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBXP_DEV},${PKGSC_LIBXP_DEV}))
+
+libxp-install:
+ ${INSTALL_DIR} ${IDIR_LIBXP}/usr/lib
+ ${CP} ${WRKINST}/usr/lib/libXp.so* ${IDIR_LIBXP}/usr/lib
+
+libxp-dev-install:
+ ${INSTALL_DIR} ${IDIR_LIBXP_DEV}/usr/include
+ ${CP} ${WRKINST}/usr/include/* ${IDIR_LIBXP_DEV}/usr/include
+ ${INSTALL_DIR} ${IDIR_LIBXP_DEV}/usr/lib/pkgconfig
+ ${INSTALL_DATA} ${WRKINST}/usr/lib/pkgconfig/*.pc \
+ ${IDIR_LIBXP_DEV}/usr/lib/pkgconfig
+
+include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/libXtst/Makefile b/package/libXtst/Makefile
new file mode 100644
index 000000000..821bf5dee
--- /dev/null
+++ b/package/libXtst/Makefile
@@ -0,0 +1,37 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:= libXtst
+PKG_VERSION:= 1.2.0
+PKG_RELEASE:= 1
+PKG_MD5SUM:= fd94ddca70e10eef4640e1f57b0301ee
+PKG_DESCR:= Xtst library
+PKG_SECTION:= x11/libs
+PKG_BUILDDEP:= recordproto libXi
+PKG_SITES:= ${MASTER_SITE_XORG}
+
+PKG_SUBPKGS:= LIBXTST LIBXTST_DEV
+PKGSD_LIBXTST_DEV:= Xtst headers
+PKGSC_LIBXTST_DEV:= x11/devel
+
+include $(TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,LIBXTST,libxtst,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,LIBXTST_DEV,libxtst-dev,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBXTST_DEV},${PKGSC_LIBXTST_DEV}))
+
+CONFIGURE_ARGS+= --disable-malloc0returnsnull
+
+libxtst-install:
+ ${INSTALL_DIR} ${IDIR_LIBXTST}/usr/lib
+ ${CP} ${WRKINST}/usr/lib/libXtst.so* ${IDIR_LIBXTST}/usr/lib
+
+libxtst-dev-install:
+ ${INSTALL_DIR} ${IDIR_LIBXTST_DEV}/usr/include
+ ${CP} ${WRKINST}/usr/include/* ${IDIR_LIBXTST_DEV}/usr/include
+ ${INSTALL_DIR} ${IDIR_LIBXTST_DEV}/usr/lib/pkgconfig
+ ${INSTALL_DATA} ${WRKINST}/usr/lib/pkgconfig/*.pc \
+ ${IDIR_LIBXTST_DEV}/usr/lib/pkgconfig
+
+include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/openjdk/Makefile b/package/openjdk/Makefile
index cf81f7cab..41775218a 100644
--- a/package/openjdk/Makefile
+++ b/package/openjdk/Makefile
@@ -15,7 +15,8 @@ PKG_MD5SUM:= 2d2bbbb0f9b81f1fec41ec730da8a933 \
d526d0848c88607ce4e3a0a4edb75d50
PKG_DESCR:= OpenJDK Java VM
PKG_SECTION:= lang
-PKG_BUILDDEP:= xproto jpeg zlib libX11 libpng freetype
+PKG_BUILDDEP:= alsa-lib xproto jpeg zlib libX11 libpng freetype cups
+PKG_BUILDDEP+= libXt libXp libXinerama libXrender libXtst
PKG_URL:= http://openjdk.org/
PKG_SITES:= http://download.java.net/openjdk/jdk6/promoted/b22/ \
http://mirror.netcologne.de/apache.org/xml/xalan-j/binaries/ \
@@ -30,19 +31,19 @@ ICEDTEA_VERSION:= 1.10
XALAN_NAME= xalan-j
XALAN_VERSION= 2_7_0
+# override generic extraction
+EXTRACT_OVERRIDE:= 1
DISTFILES:= $(PKG_NAME)-$(PKG_VERSION)-src-$(PKG_EXTRAVER).tar.gz \
$(ICEDTEA_NAME)-$(ICEDTEA_VERSION).tar.gz \
jaxp144_01.zip \
jdk6-jaf-b20.zip \
jdk6-jaxws-b20.zip \
${XALAN_NAME}_${XALAN_VERSION}-bin.tar.gz
-NO_DISTFILES:= 1
+
WRKDIST= ${WRKDIR}
WRKSRC= ${WRKDIST}/${ICEDTEA_NAME}-${ICEDTEA_VERSION}
PKG_SUBPKGS:= OPENJDK
-PKG_CFLINE_OPENJDK:= select ADK_TOOLCHAIN_GCC_JAVA
-
PKG_CHOICES_OPENJDK:= ZERO SHARK CACAO JAMVM
PKGCD_ZERO:= zero-assembly backend
PKGCD_SHARK:= JIT backend
@@ -64,54 +65,51 @@ endif
CONFIGURE_ARGS+= --disable-docs \
--enable-bootstrap \
--enable-openjdk-cross-compilation \
- --with-jdk-home=${STAGING_JAVA_HOST_DIR}/usr/lib/jvm \
- --with-java=$(STAGING_JAVA_HOST_DIR)/usr/bin/jamvm \
- --with-javac=$(STAGING_JAVA_HOST_DIR)/usr/bin/ecj \
- --with-gcj=$(STAGING_JAVA_HOST_DIR)/usr/bin/gcj \
--with-openjdk-src-dir=$(WRKDIST)/$(PKG_NAME)-$(PKG_VERSION) \
--with-xalan2-jar=${WRKDIST}/${XALAN_NAME}_${XALAN_VERSION}/xalan.jar \
--with-xalan2-serializer-jar=${WRKDIST}/${XALAN_NAME}_${XALAN_VERSION}/serializer.jar \
--with-xerces2-jar=${WRKDIST}/${XALAN_NAME}_${XALAN_VERSION}/xercesImpl.jar \
- --with-ecj-jar=${STAGING_JAVA_HOST_DIR}/usr/share/ecj.jar \
- --without-rhino \
- --disable-xrender \
- --disable-nss
+ --with-jdk-home=$(WRKSRC)/openjdk.build/j2sdk-image \
+ --with-java=$(WRKSRC)/openjdk.build/j2sdk-image/bin/java \
+ --with-javac=$(WRKSRC)/openjdk.build/j2sdk-image/bin/javac \
+ --with-javah=$(WRKSRC)/openjdk.build/j2sdk-image/bin/javah \
+ --with-jar=$(WRKSRC)/openjdk.build/j2sdk-image/bin/jar \
+ --with-rmic=$(WRKSRC)/openjdk.build/j2sdk-image/bin/rmic \
+ --with-native2ascii=$(WRKSRC)/openjdk.build/j2sdk-image/bin/native2ascii \
+ --without-rhino
OPENJDK_BUILD_ENV+= JAVACFLAGS="-cp ${STAGING_JAVA_HOST_DIR}/usr/share/java/libgcj-4.5.2.jar"
OPENJDK_BUILD_ENV+= DYLD_LIBRARY_PATH=$(STAGING_JAVA_HOST_DIR)/usr/lib:$(STAGING_JAVA_HOST_DIR)/usr/lib64
OPENJDK_BUILD_ENV+= LD_LIBRARY_PATH=$(STAGING_JAVA_HOST_DIR)/usr/lib:$(STAGING_JAVA_HOST_DIR)/usr/lib64
OPENJDK_BUILD_ENV+= ADK_ECJ=$(STAGING_JAVA_HOST_DIR)/usr/bin/ecj
-CONFIGURE_ENV+= ${OPENJDK_BUILD_ENV}
-MAKE_ENV+= ${OPENJDK_BUILD_ENV}
do-extract:
- (cd ${WRKDIST}; mkdir $(PKG_NAME)-$(PKG_VERSION) ; tar xzf $(TOPDIR)/dl/$(PKG_NAME)-$(PKG_VERSION)-src-$(PKG_EXTRAVER).tar.gz -C $(PKG_NAME)-$(PKG_VERSION))
- (cd $(WRKDIST); tar xzf $(TOPDIR)/dl/$(ICEDTEA_NAME)-$(ICEDTEA_VERSION).tar.gz)
+ cd ${WRKDIST}; mkdir $(PKG_NAME)-$(PKG_VERSION) ; \
+ tar xzf $(TOPDIR)/dl/$(PKG_NAME)-$(PKG_VERSION)-src-$(PKG_EXTRAVER).tar.gz -C $(PKG_NAME)-$(PKG_VERSION)
+ cd $(WRKDIST); tar xzf $(TOPDIR)/dl/$(ICEDTEA_NAME)-$(ICEDTEA_VERSION).tar.gz
cd ${WRKDIST}; tar xzf ${TOPDIR}/dl/${XALAN_NAME}_${XALAN_VERSION}-bin.tar.gz
mkdir -p ${WRKBUILD}/drops
cd ${TOPDIR}/dl; cp jaxp144_01.zip jdk6-jaf-b20.zip jdk6-jaxws-b20.zip \
- ${WRKBUILD}/drops/
+ ${WRKBUILD}/drops
-x-pre-configure:
- cd ${WRKBUILD}; rm -rf config.{cache,status};\
+pre-configure:
+ cd ${WRKBUILD}; rm -rf config.{cache,status}; \
export ${OPENJDK_BUILD_ENV}; ./configure \
--enable-bootstrap \
--enable-zero \
+ --disable-openjdk-cross-compilation \
+ --with-openjdk-src-dir=$(WRKDIST)/$(PKG_NAME)-$(PKG_VERSION) \
--with-jdk-home=$(STAGING_JAVA_HOST_DIR)/usr/lib/jvm \
- --with-java=$(STAGING_JAVA_HOST_DIR)/usr/bin/jamvm \
+ --with-java=$(STAGING_JAVA_HOST_DIR)/usr/bin/gij \
--with-javac=$(STAGING_JAVA_HOST_DIR)/usr/bin/ecj \
--with-gcj=$(STAGING_JAVA_HOST_DIR)/usr/bin/gcj \
- --with-openjdk-src-dir=$(WRKDIST)/$(PKG_NAME)-$(PKG_VERSION) \
--with-ecj-jar=${STAGING_JAVA_HOST_DIR}/usr/share/ecj.jar \
- --disable-docs \
- --disable-openjdk-cross-compilation \
--with-xalan2-jar=${WRKDIST}/${XALAN_NAME}_${XALAN_VERSION}/xalan.jar \
--with-xalan2-serializer-jar=${WRKDIST}/${XALAN_NAME}_${XALAN_VERSION}/serializer.jar \
--with-xerces2-jar=${WRKDIST}/${XALAN_NAME}_${XALAN_VERSION}/xercesImpl.jar \
--without-rhino \
- --disable-xrender \
- --disable-nss \
- && ${MAKE}
+ --disable-docs \
+ ;${MAKE}
openjdk-install:
$(INSTALL_DIR) $(IDIR_OPENJDK)/usr/bin
diff --git a/package/openjdk/patches/patch-icedtea6-1_10_Makefile_in b/package/openjdk/patches/patch-icedtea6-1_10_Makefile_in
index b0464fb38..50667a68a 100644
--- a/package/openjdk/patches/patch-icedtea6-1_10_Makefile_in
+++ b/package/openjdk/patches/patch-icedtea6-1_10_Makefile_in
@@ -27,10 +27,10 @@
- $(GCJ) $(IT_CFLAGS) -Wl,-Bsymbolic -findirect-dispatch -o native-ecj \
- --main=org.eclipse.jdt.internal.compiler.batch.Main ${ECJ_JAR} ; \
- fi ; \
++ mkdir -p stamps ; \
+ if test -n "${ADK_ECJ}" && test -x "${ADK_ECJ}"; then \
+ ln -s "${ADK_ECJ}" native-ecj; \
+ else \
-+ mkdir -p stamps ; \
+ if test "x$(GCJ)" != "xno"; then \
+ $(GCJ) $(IT_CFLAGS) -Wl,-Bsymbolic -findirect-dispatch -o native-ecj \
+ --main=org.eclipse.jdt.internal.compiler.batch.Main ${ECJ_JAR} ; \
diff --git a/package/openjdk/patches/patch-icedtea6-1_10_configure b/package/openjdk/patches/patch-icedtea6-1_10_configure
deleted file mode 100644
index d9b96d1d4..000000000
--- a/package/openjdk/patches/patch-icedtea6-1_10_configure
+++ /dev/null
@@ -1,479 +0,0 @@
---- w-openjdk-6-1.orig/icedtea6-1.10/configure 2011-03-02 20:48:44.321157333 +0100
-+++ w-openjdk-6-1/icedtea6-1.10/configure 2011-03-28 15:30:08.791808629 +0200
-@@ -10805,22 +10805,6 @@ fi
-
-
-
--for ac_header in cups/cups.h cups/ppd.h
--do :
-- as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
--ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
--if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
-- cat >>confdefs.h <<_ACEOF
--#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
--_ACEOF
--
--
--else
-- as_fn_error $? "\"CUPS headers were not found -
-- try installing cups-devel.\"" "$LINENO" 5
--fi
--
--done
-
- for ac_header in X11/X.h
- do :
-@@ -10879,46 +10863,6 @@ else
- as_fn_error $? "\"libjpeg not found - try installing libjpeg-devel\"" "$LINENO" 5
- fi
-
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lgif" >&5
--$as_echo_n "checking for main in -lgif... " >&6; }
--if ${ac_cv_lib_gif_main+:} false; then :
-- $as_echo_n "(cached) " >&6
--else
-- ac_check_lib_save_LIBS=$LIBS
--LIBS="-lgif $LIBS"
--cat confdefs.h - <<_ACEOF >conftest.$ac_ext
--/* end confdefs.h. */
--
--
--int
--main ()
--{
--return main ();
-- ;
-- return 0;
--}
--_ACEOF
--if ac_fn_c_try_link "$LINENO"; then :
-- ac_cv_lib_gif_main=yes
--else
-- ac_cv_lib_gif_main=no
--fi
--rm -f core conftest.err conftest.$ac_objext \
-- conftest$ac_exeext conftest.$ac_ext
--LIBS=$ac_check_lib_save_LIBS
--fi
--{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gif_main" >&5
--$as_echo "$ac_cv_lib_gif_main" >&6; }
--if test "x$ac_cv_lib_gif_main" = xyes; then :
-- cat >>confdefs.h <<_ACEOF
--#define HAVE_LIBGIF 1
--_ACEOF
--
-- LIBS="-lgif $LIBS"
--
--else
-- as_fn_error $? "\"giflib not found - try installing giflib-devel\"" "$LINENO" 5
--fi
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lz" >&5
- $as_echo_n "checking for main in -lz... " >&6; }
-@@ -11040,156 +10984,9 @@ fi
-
-
-
--pkg_failed=no
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for XT" >&5
--$as_echo_n "checking for XT... " >&6; }
--
--if test -n "$XT_CFLAGS"; then
-- pkg_cv_XT_CFLAGS="$XT_CFLAGS"
-- elif test -n "$PKG_CONFIG"; then
-- if test -n "$PKG_CONFIG" && \
-- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xt\""; } >&5
-- ($PKG_CONFIG --exists --print-errors "xt") 2>&5
-- ac_status=$?
-- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-- test $ac_status = 0; }; then
-- pkg_cv_XT_CFLAGS=`$PKG_CONFIG --cflags "xt" 2>/dev/null`
--else
-- pkg_failed=yes
--fi
-- else
-- pkg_failed=untried
--fi
--if test -n "$XT_LIBS"; then
-- pkg_cv_XT_LIBS="$XT_LIBS"
-- elif test -n "$PKG_CONFIG"; then
-- if test -n "$PKG_CONFIG" && \
-- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xt\""; } >&5
-- ($PKG_CONFIG --exists --print-errors "xt") 2>&5
-- ac_status=$?
-- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-- test $ac_status = 0; }; then
-- pkg_cv_XT_LIBS=`$PKG_CONFIG --libs "xt" 2>/dev/null`
--else
-- pkg_failed=yes
--fi
-- else
-- pkg_failed=untried
--fi
--
--
--
--if test $pkg_failed = yes; then
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
--$as_echo "no" >&6; }
--
--if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-- _pkg_short_errors_supported=yes
--else
-- _pkg_short_errors_supported=no
--fi
-- if test $_pkg_short_errors_supported = yes; then
-- XT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "xt" 2>&1`
-- else
-- XT_PKG_ERRORS=`$PKG_CONFIG --print-errors "xt" 2>&1`
-- fi
-- # Put the nasty error message in config.log where it belongs
-- echo "$XT_PKG_ERRORS" >&5
--
-- XT_FOUND=no
--elif test $pkg_failed = untried; then
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
--$as_echo "no" >&6; }
-- XT_FOUND=no
--else
-- XT_CFLAGS=$pkg_cv_XT_CFLAGS
-- XT_LIBS=$pkg_cv_XT_LIBS
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
--$as_echo "yes" >&6; }
-- XT_FOUND=yes
--fi
--if test "x${XT_FOUND}" = xno
--then
-- as_fn_error $? "Could not find Xt - \
-- Try installing libXt-devel." "$LINENO" 5
--fi
--
--
--
--
--pkg_failed=no
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for XP" >&5
--$as_echo_n "checking for XP... " >&6; }
--
--if test -n "$XP_CFLAGS"; then
-- pkg_cv_XP_CFLAGS="$XP_CFLAGS"
-- elif test -n "$PKG_CONFIG"; then
-- if test -n "$PKG_CONFIG" && \
-- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xp\""; } >&5
-- ($PKG_CONFIG --exists --print-errors "xp") 2>&5
-- ac_status=$?
-- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-- test $ac_status = 0; }; then
-- pkg_cv_XP_CFLAGS=`$PKG_CONFIG --cflags "xp" 2>/dev/null`
--else
-- pkg_failed=yes
--fi
-- else
-- pkg_failed=untried
--fi
--if test -n "$XP_LIBS"; then
-- pkg_cv_XP_LIBS="$XP_LIBS"
-- elif test -n "$PKG_CONFIG"; then
-- if test -n "$PKG_CONFIG" && \
-- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xp\""; } >&5
-- ($PKG_CONFIG --exists --print-errors "xp") 2>&5
-- ac_status=$?
-- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-- test $ac_status = 0; }; then
-- pkg_cv_XP_LIBS=`$PKG_CONFIG --libs "xp" 2>/dev/null`
--else
-- pkg_failed=yes
--fi
-- else
-- pkg_failed=untried
--fi
--
--
-
--if test $pkg_failed = yes; then
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
--$as_echo "no" >&6; }
-
--if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-- _pkg_short_errors_supported=yes
--else
-- _pkg_short_errors_supported=no
--fi
-- if test $_pkg_short_errors_supported = yes; then
-- XP_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "xp" 2>&1`
-- else
-- XP_PKG_ERRORS=`$PKG_CONFIG --print-errors "xp" 2>&1`
-- fi
-- # Put the nasty error message in config.log where it belongs
-- echo "$XP_PKG_ERRORS" >&5
-
-- XP_FOUND=no
--elif test $pkg_failed = untried; then
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
--$as_echo "no" >&6; }
-- XP_FOUND=no
--else
-- XP_CFLAGS=$pkg_cv_XP_CFLAGS
-- XP_LIBS=$pkg_cv_XP_LIBS
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
--$as_echo "yes" >&6; }
-- XP_FOUND=yes
--fi
--if test "x${XP_FOUND}" = xno
--then
-- as_fn_error $? "Could not find Xp - \
-- Try installing libXp-devel." "$LINENO" 5
--fi
-
-
-
-@@ -11271,83 +11068,6 @@ fi
-
-
-
--pkg_failed=no
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for XINERAMA" >&5
--$as_echo_n "checking for XINERAMA... " >&6; }
--
--if test -n "$XINERAMA_CFLAGS"; then
-- pkg_cv_XINERAMA_CFLAGS="$XINERAMA_CFLAGS"
-- elif test -n "$PKG_CONFIG"; then
-- if test -n "$PKG_CONFIG" && \
-- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xinerama\""; } >&5
-- ($PKG_CONFIG --exists --print-errors "xinerama") 2>&5
-- ac_status=$?
-- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-- test $ac_status = 0; }; then
-- pkg_cv_XINERAMA_CFLAGS=`$PKG_CONFIG --cflags "xinerama" 2>/dev/null`
--else
-- pkg_failed=yes
--fi
-- else
-- pkg_failed=untried
--fi
--if test -n "$XINERAMA_LIBS"; then
-- pkg_cv_XINERAMA_LIBS="$XINERAMA_LIBS"
-- elif test -n "$PKG_CONFIG"; then
-- if test -n "$PKG_CONFIG" && \
-- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xinerama\""; } >&5
-- ($PKG_CONFIG --exists --print-errors "xinerama") 2>&5
-- ac_status=$?
-- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-- test $ac_status = 0; }; then
-- pkg_cv_XINERAMA_LIBS=`$PKG_CONFIG --libs "xinerama" 2>/dev/null`
--else
-- pkg_failed=yes
--fi
-- else
-- pkg_failed=untried
--fi
--
--
--
--if test $pkg_failed = yes; then
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
--$as_echo "no" >&6; }
--
--if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-- _pkg_short_errors_supported=yes
--else
-- _pkg_short_errors_supported=no
--fi
-- if test $_pkg_short_errors_supported = yes; then
-- XINERAMA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "xinerama" 2>&1`
-- else
-- XINERAMA_PKG_ERRORS=`$PKG_CONFIG --print-errors "xinerama" 2>&1`
-- fi
-- # Put the nasty error message in config.log where it belongs
-- echo "$XINERAMA_PKG_ERRORS" >&5
--
-- XINERAMA_FOUND=no
--elif test $pkg_failed = untried; then
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
--$as_echo "no" >&6; }
-- XINERAMA_FOUND=no
--else
-- XINERAMA_CFLAGS=$pkg_cv_XINERAMA_CFLAGS
-- XINERAMA_LIBS=$pkg_cv_XINERAMA_LIBS
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
--$as_echo "yes" >&6; }
-- XINERAMA_FOUND=yes
--
--fi
--if test "x${XINERAMA_FOUND}" = xno
--then
-- as_fn_error $? "Could not find Xinerama - \
-- Try installing libXinerama-devel." "$LINENO" 5
--fi
--
--
--
- if test "x${ENABLE_XRENDER}" = "xyes"
- then
-
-@@ -11610,79 +11330,6 @@ fi
-
-
-
--pkg_failed=no
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for XTST" >&5
--$as_echo_n "checking for XTST... " >&6; }
--
--if test -n "$XTST_CFLAGS"; then
-- pkg_cv_XTST_CFLAGS="$XTST_CFLAGS"
-- elif test -n "$PKG_CONFIG"; then
-- if test -n "$PKG_CONFIG" && \
-- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xtst\""; } >&5
-- ($PKG_CONFIG --exists --print-errors "xtst") 2>&5
-- ac_status=$?
-- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-- test $ac_status = 0; }; then
-- pkg_cv_XTST_CFLAGS=`$PKG_CONFIG --cflags "xtst" 2>/dev/null`
--else
-- pkg_failed=yes
--fi
-- else
-- pkg_failed=untried
--fi
--if test -n "$XTST_LIBS"; then
-- pkg_cv_XTST_LIBS="$XTST_LIBS"
-- elif test -n "$PKG_CONFIG"; then
-- if test -n "$PKG_CONFIG" && \
-- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xtst\""; } >&5
-- ($PKG_CONFIG --exists --print-errors "xtst") 2>&5
-- ac_status=$?
-- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-- test $ac_status = 0; }; then
-- pkg_cv_XTST_LIBS=`$PKG_CONFIG --libs "xtst" 2>/dev/null`
--else
-- pkg_failed=yes
--fi
-- else
-- pkg_failed=untried
--fi
--
--
--
--if test $pkg_failed = yes; then
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
--$as_echo "no" >&6; }
--
--if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-- _pkg_short_errors_supported=yes
--else
-- _pkg_short_errors_supported=no
--fi
-- if test $_pkg_short_errors_supported = yes; then
-- XTST_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "xtst" 2>&1`
-- else
-- XTST_PKG_ERRORS=`$PKG_CONFIG --print-errors "xtst" 2>&1`
-- fi
-- # Put the nasty error message in config.log where it belongs
-- echo "$XTST_PKG_ERRORS" >&5
--
-- XTST_FOUND=no
--elif test $pkg_failed = untried; then
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
--$as_echo "no" >&6; }
-- XTST_FOUND=no
--else
-- XTST_CFLAGS=$pkg_cv_XTST_CFLAGS
-- XTST_LIBS=$pkg_cv_XTST_LIBS
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
--$as_echo "yes" >&6; }
-- XTST_FOUND=yes
--fi
--if test "x${XTST_FOUND}" = xno
--then
-- as_fn_error $? "Could not find Xtst - \
-- Try installing libXtst-devel." "$LINEN