From 54302bd22cbdda4cabf0541cabfb7c3373a92356 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Mon, 4 Apr 2011 19:44:06 +0200 Subject: get all prerequisites for openjdk (cross-compile) right --- jtools/cacao/Makefile | 34 ---------------------------------- jtools/jamvm/Makefile | 37 ------------------------------------- package/alsa-lib/Makefile | 2 ++ package/giflib/Makefile | 24 ++++++++++++++++++++++++ package/libXinerama/Makefile | 37 +++++++++++++++++++++++++++++++++++++ package/libXp/Makefile | 35 +++++++++++++++++++++++++++++++++++ package/libXtst/Makefile | 37 +++++++++++++++++++++++++++++++++++++ package/openjdk/Makefile | 3 ++- package/printproto/Makefile | 25 +++++++++++++++++++++++++ package/xineramaproto/Makefile | 25 +++++++++++++++++++++++++ 10 files changed, 187 insertions(+), 72 deletions(-) delete mode 100644 jtools/cacao/Makefile delete mode 100644 jtools/jamvm/Makefile create mode 100644 package/giflib/Makefile create mode 100644 package/libXinerama/Makefile create mode 100644 package/libXp/Makefile create mode 100644 package/libXtst/Makefile create mode 100644 package/printproto/Makefile create mode 100644 package/xineramaproto/Makefile diff --git a/jtools/cacao/Makefile b/jtools/cacao/Makefile deleted file mode 100644 index 7b5262dcc..000000000 --- a/jtools/cacao/Makefile +++ /dev/null @@ -1,34 +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/$(PKG_NAME)-$(PKG_VERSION)/ - -DISTFILES:= $(PKG_NAME)-$(PKG_VERSION).tar.bz2 - -include ../rules.mk - -install: ${STAGING_JAVA_HOST_DIR}/usr/bin/cacao - -$(WRKBUILD)/.configured: ${WRKDIST}/.prepared - cd $(WRKBUILD); ./configure --prefix=/usr --disable-libjvm --enable-debug \ - --with-vm-zip=$(STAGING_JAVA_HOST_DIR)/usr/share/cacao/vm.zip \ - --with-java-runtime-library=gnuclasspath \ - --with-java-runtime-library-classes=$(STAGING_JAVA_HOST_DIR)/usr/share/classpath/glibj.zip \ - --with-java-runtime-library-prefix=$(STAGING_JAVA_HOST_DIR)/usr \ - --with-jni_md_h=$(STAGING_JAVA_HOST_DIR)/usr/include \ - touch $@ - -$(WRKBUILD)/.compiled: ${WRKDIST}/.configured - ${MAKE} -C ${WRKBUILD} $(MAKE_TRACE) - touch $@ - -${STAGING_JAVA_HOST_DIR}/usr/bin/cacao: $(WRKBUILD)/.compiled - ${MAKE} -C ${WRKBUILD} DESTDIR=$(STAGING_JAVA_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/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 09345b198..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 cups +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/ \ diff --git a/package/printproto/Makefile b/package/printproto/Makefile new file mode 100644 index 000000000..63a09d3d6 --- /dev/null +++ b/package/printproto/Makefile @@ -0,0 +1,25 @@ +# 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:= printproto +PKG_VERSION:= 1.0.5 +PKG_RELEASE:= 1 +PKG_DESCR:= X Print Extension headers +PKG_SECTION:= x11/devel +PKG_MD5SUM:= 5afeb3a7de8a14b417239a14ea724268 +PKG_SITES:= http://xorg.freedesktop.org/releases/individual/proto/ + +include $(TOPDIR)/mk/package.mk + +$(eval $(call PKG_template,PRINTPROTO,printproto,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) + +post-install: + ${INSTALL_DIR} ${IDIR_PRINTPROTO}/usr/include + ${CP} ${WRKINST}/usr/include/X11 ${IDIR_PRINTPROTO}/usr/include + ${INSTALL_DIR} ${IDIR_PRINTPROTO}/usr/lib/pkgconfig + ${INSTALL_DATA} ${WRKINST}/usr/lib/pkgconfig/*.pc \ + ${IDIR_PRINTPROTO}/usr/lib/pkgconfig + +include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/xineramaproto/Makefile b/package/xineramaproto/Makefile new file mode 100644 index 000000000..9f920d70b --- /dev/null +++ b/package/xineramaproto/Makefile @@ -0,0 +1,25 @@ +# 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:= xineramaproto +PKG_VERSION:= 1.2 +PKG_RELEASE:= 1 +PKG_DESCR:= Xinerama Extension headers +PKG_SECTION:= x11/devel +PKG_MD5SUM:= 1e98484ffa9b0eb6ab9d00cd53bfe74f +PKG_SITES:= http://xorg.freedesktop.org/releases/individual/proto/ + +include $(TOPDIR)/mk/package.mk + +$(eval $(call PKG_template,XINERAMAPROTO,xineramaproto,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) + +post-install: + ${INSTALL_DIR} ${IDIR_XINERAMAPROTO}/usr/include + ${CP} ${WRKINST}/usr/include/X11 ${IDIR_XINERAMAPROTO}/usr/include + ${INSTALL_DIR} ${IDIR_XINERAMAPROTO}/usr/lib/pkgconfig + ${INSTALL_DATA} ${WRKINST}/usr/lib/pkgconfig/*.pc \ + ${IDIR_XINERAMAPROTO}/usr/lib/pkgconfig + +include ${TOPDIR}/mk/pkg-bottom.mk -- cgit v1.2.3