summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2011-03-03 20:04:34 +0100
committerWaldemar Brodkorb <wbx@openadk.org>2011-03-03 20:04:34 +0100
commit832be8425b55a47c0b8e9d493df1ae81dbe61dd4 (patch)
treea795baaa265e9fbda4d36b71b199ab70177b9891
parentc8034b6c5297caa7124070065ec156812219471c (diff)
more native compile fixes on my ibm x40
-rw-r--r--package/firefox/Makefile2
-rw-r--r--package/fuse/Makefile1
-rw-r--r--package/gdbm/Makefile11
-rw-r--r--package/gzip/Makefile25
-rw-r--r--package/libIDL/Makefile11
-rw-r--r--package/libIDL/patches/patch-Makefile_in20
-rw-r--r--package/libfontenc/Makefile6
-rw-r--r--package/libgssglue/Makefile11
-rw-r--r--package/libpcap/Makefile1
-rw-r--r--package/libxcb/Makefile3
-rw-r--r--package/python2/Makefile2
-rw-r--r--package/xcb-proto/Makefile2
-rw-r--r--scripts/scan-pkgs.sh1
13 files changed, 84 insertions, 12 deletions
diff --git a/package/firefox/Makefile b/package/firefox/Makefile
index ff00a5bf9..6d583cc60 100644
--- a/package/firefox/Makefile
+++ b/package/firefox/Makefile
@@ -19,7 +19,7 @@ PKG_SITES:= http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${PKG_
PKG_NOPARALLEL:= 1
PKG_NEED_CXX:= 1
-PKG_ARCH_DEPENDS:= x86 x86_64 mips mipsel mips64 mips64el
+PKG_ARCH_DEPENDS:= x86 x86_64 mips mipsel mips64 mips64el native
PKG_HOST_DEPENDS:= !netbsd !freebsd !openbsd !cygwin
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.source.tar.bz2
diff --git a/package/fuse/Makefile b/package/fuse/Makefile
index 01164ec2c..84e6474c9 100644
--- a/package/fuse/Makefile
+++ b/package/fuse/Makefile
@@ -28,6 +28,7 @@ $(eval $(call PKG_template,LIBFUSE_DEV,libfuse-dev,${PKG_VERSION}-${PKG_RELEASE}
CONFIGURE_ARGS+= --enable-lib \
--enable-util \
--enable-example \
+ --with-libiconv-prefix="${STAGING_TARGET_DIR}/usr" \
--disable-auto-modprobe \
--disable-mtab \
--disable-kernel-module
diff --git a/package/gdbm/Makefile b/package/gdbm/Makefile
index 42dfeacfd..7f4283e70 100644
--- a/package/gdbm/Makefile
+++ b/package/gdbm/Makefile
@@ -12,18 +12,23 @@ PKG_SECTION:= libs
PKG_URL:= http://www.gnu.org/software/gdbm/
PKG_SITES:= ${MASTER_SITE_GNU:=gdbm/}
-PKG_SUBPKGS:= LIBGDBM
+PKG_SUBPKGS:= LIBGDBM LIBGDBM_DEV
include ${TOPDIR}/mk/package.mk
$(eval $(call PKG_template,LIBGDBM,libgdbm,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,LIBGDBM_DEV,libgdbm-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
XAKE_FLAGS+= BINOWN=`id -u` \
BINGRP=`id -g` \
INSTALL_ROOT="${WRKINST}"
-post-install:
+libgdbm-install:
${INSTALL_DIR} ${IDIR_LIBGDBM}/usr/lib
- ${CP} ${WRKINST}/usr/lib/libgdbm.so* ${IDIR_LIBGDBM}/usr/lib/
+ ${CP} ${WRKINST}/usr/lib/libgdbm.so* ${IDIR_LIBGDBM}/usr/lib
+
+libgdbm-dev-install:
+ ${INSTALL_DIR} ${IDIR_LIBGDBM_DEV}/usr/include
+ ${CP} ${WRKINST}/usr/include/*.h ${IDIR_LIBGDBM_DEV}/usr/include
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/gzip/Makefile b/package/gzip/Makefile
new file mode 100644
index 000000000..bb6513099
--- /dev/null
+++ b/package/gzip/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:= gzip
+PKG_VERSION:= 1.2.4
+PKG_RELEASE:= 1
+PKG_MD5SUM:= 618b61219aa2d812893281bf6c66f158
+PKG_DESCR:= a compression utility
+PKG_SECTION:= archive
+PKG_URL:= http://www.gzip.org/
+PKG_SITES:= ${MASTER_SITE_GNU:=gzip/}
+
+include $(TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,GZIP,gzip,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+
+FAKE_FLAGS+= prefix=${WRKINST}
+
+gzip-install:
+ $(INSTALL_DIR) $(IDIR_GZIP)/usr/bin
+ $(INSTALL_BIN) $(WRKINST)/bin/{gunzip,zcat,zgrep,gzip} $(IDIR_GZIP)/usr/bin
+
+include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/libIDL/Makefile b/package/libIDL/Makefile
index 749782019..89c0311d6 100644
--- a/package/libIDL/Makefile
+++ b/package/libIDL/Makefile
@@ -17,10 +17,19 @@ include $(TOPDIR)/mk/package.mk
CONFIGURE_ENV+= libIDL_cv_long_long_format=ll
$(eval $(call PKG_template,LIBIDL,libidl,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,LIBIDL_DEV,libidl-dev,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-post-install:
+libidl-install:
$(INSTALL_DIR) $(IDIR_LIBIDL)/usr/lib
$(CP) $(WRKINST)/usr/lib/libIDL*.so* \
$(IDIR_LIBIDL)/usr/lib
+libidl-dev-install:
+ $(INSTALL_DIR) $(IDIR_LIBIDL_DEV)/usr/bin
+ ${INSTALL_BIN} ${WRKINST}/usr/bin/libIDL-config-2 \
+ $(IDIR_LIBIDL_DEV)/usr/bin
+ $(INSTALL_DIR) $(IDIR_LIBIDL_DEV)/usr/lib/pkgconfig
+ ${INSTALL_DATA} ${WRKINST}/usr/lib/pkgconfig/*.pc \
+ $(IDIR_LIBIDL_DEV)/usr/lib/pkgconfig
+
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/libIDL/patches/patch-Makefile_in b/package/libIDL/patches/patch-Makefile_in
new file mode 100644
index 000000000..a1291b434
--- /dev/null
+++ b/package/libIDL/patches/patch-Makefile_in
@@ -0,0 +1,20 @@
+--- libIDL-0.8.14.orig/Makefile.in 2010-03-30 12:37:04.000000000 +0200
++++ libIDL-0.8.14/Makefile.in 2011-03-01 22:26:10.000000000 +0100
+@@ -37,7 +37,7 @@ PRE_UNINSTALL = :
+ POST_UNINSTALL = :
+ build_triplet = @build@
+ host_triplet = @host@
+-noinst_PROGRAMS = tstidl$(EXEEXT)
++noinst_PROGRAMS =
+ subdir = .
+ DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
+ $(srcdir)/Makefile.in $(srcdir)/Makefile.msc.in \
+@@ -1276,7 +1276,7 @@ lexer.c: $(srcdir)/lexer.l parser.h
+ $(AM_V_GEN) $(LEX) $(LFLAGS) -t $(srcdir)/lexer.l | sed -e 's/yy/__IDL_/g' >$@
+
+ stamp-parser: $(srcdir)/parser.y
+- $(AM_V_GEN) $(YACC) $(YFLAGS) $(srcdir)/parser.y
++ -$(AM_V_GEN) $(YACC) $(YFLAGS) $(srcdir)/parser.y
+ @touch $@
+
+ parser.c: stamp-parser
diff --git a/package/libfontenc/Makefile b/package/libfontenc/Makefile
index bc40cd015..0b9193798 100644
--- a/package/libfontenc/Makefile
+++ b/package/libfontenc/Makefile
@@ -13,10 +13,14 @@ PKG_DEPENDS:= zlib
PKG_BUILDDEP:= xproto zlib
PKG_SITES:= ${MASTER_SITE_XORG}
+PKG_SUBPKGS:= LIBFONTENC LIBFONTENC_DEV
+PKGSC_LIBFONTENC_DEV:= devel
+PKGSD_LIBFONTENC_DEV:= libfontenc headers
+
include $(TOPDIR)/mk/package.mk
$(eval $(call PKG_template,LIBFONTENC,libfontenc,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,LIBFONTENC_DEV,libfontenc-dev,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,LIBFONTENC_DEV,libfontenc-dev,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBFONTENC_DEV},${PKGSC_LIBFONTENC_DEV}))
libfontenc-install:
${INSTALL_DIR} ${IDIR_LIBFONTENC}/usr/lib
diff --git a/package/libgssglue/Makefile b/package/libgssglue/Makefile
index 4cd325af8..4cb96da37 100644
--- a/package/libgssglue/Makefile
+++ b/package/libgssglue/Makefile
@@ -11,17 +11,24 @@ PKG_DESCR:= GSS glue library for NFSv4
PKG_SECTION:= libs
PKG_SITES:= http://www.citi.umich.edu/projects/nfsv4/linux/libgssglue/
+PKG_SUBPKGS:= LIBGSSGLUE LIBGSSGLUE_DEV
+PKGSD_LIBGSSGLUE_DEV:= GSS glue headers for NFSv4
+PKGSC_LIBGSSGLUE_DEV:= devel
+
include $(TOPDIR)/mk/package.mk
$(eval $(call PKG_template,LIBGSSGLUE,libgssglue,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,LIBGSSGLUE_DEV,libgssglue-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,LIBGSSGLUE_DEV,libgssglue-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBGSSGLUE_DEV},${PKGSC_LIBGSSGLUE_DEV}))
libgssglue-install:
$(INSTALL_DIR) $(IDIR_LIBGSSGLUE)/usr/lib
- $(CP) $(WRKINST)/usr/lib/libgssglue.so* $(IDIR_LIBGSSGLUE)/usr/lib/
+ $(CP) $(WRKINST)/usr/lib/libgssglue.so* $(IDIR_LIBGSSGLUE)/usr/lib
libgssglue-dev-install:
$(INSTALL_DIR) $(IDIR_LIBGSSGLUE_DEV)/usr/include
${CP} $(WRKINST)/usr/include/* $(IDIR_LIBGSSGLUE_DEV)/usr/include
+ $(INSTALL_DIR) $(IDIR_LIBGSSGLUE_DEV)/usr/lib/pkgconfig
+ ${INSTALL_DATA} $(WRKINST)/usr/lib/pkgconfig/libgssglue.pc \
+ $(IDIR_LIBGSSGLUE_DEV)/usr/lib/pkgconfig
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/libpcap/Makefile b/package/libpcap/Makefile
index 6b2f09072..1c97682c7 100644
--- a/package/libpcap/Makefile
+++ b/package/libpcap/Makefile
@@ -37,6 +37,7 @@ CONFIGURE_ARGS+= --enable-ipv6
else
CONFIGURE_ARGS+= --disable-ipv6
endif
+XAKE_FLAGS+= M4=m4
libpcap-install:
${INSTALL_DIR} ${IDIR_LIBPCAP}/usr/lib
diff --git a/package/libxcb/Makefile b/package/libxcb/Makefile
index b854a4b4f..a50dec13f 100644
--- a/package/libxcb/Makefile
+++ b/package/libxcb/Makefile
@@ -12,8 +12,7 @@ PKG_SECTION:= x11/libs
PKG_BUILDDEP:= python2 libpthread-stubs libxslt libXau xcb-proto
PKG_SITES:= ${MASTER_SITE_XORG}
-PKG_SUBPKGS:= LIBXCB LIBXCB_DEVEL
-
+PKG_SUBPKGS:= LIBXCB LIBXCB_DEV
PKGSD_LIBXCB_DEV:= XML-XCB protocol headers
PKGSS_LIBXCB_DEV:= libxcb
PKGSC_LIBXCB_DEV:= x11/devel
diff --git a/package/python2/Makefile b/package/python2/Makefile
index 0af3abe5c..4c72c2e1c 100644
--- a/package/python2/Makefile
+++ b/package/python2/Makefile
@@ -63,6 +63,6 @@ post-install:
${CP} ${WRKINST}/usr/include/python2.7/* ${IDIR_PYTHON2}/usr/include/python2.7
-find ${IDIR_PYTHON2} -name "\*.pyc" -o -name "*\.pyo" -exec rm {} \;
# workaround, copy host python-config to target scripts directory
- ${CP} ${STAGING_HOST_DIR}/usr/bin/python*-config ${STAGING_TARGET_DIR}/scripts
+ ${CP} ${STAGING_HOST_DIR}/usr/bin/python*-config ${STAGING_DIR}/scripts
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/xcb-proto/Makefile b/package/xcb-proto/Makefile
index 2f3c756c6..1d24840d8 100644
--- a/package/xcb-proto/Makefile
+++ b/package/xcb-proto/Makefile
@@ -12,6 +12,8 @@ PKG_BUILDDEP:= python2
PKG_MD5SUM:= 8d29695e8faf5fcdce568c66eaeaa5ee
PKG_SITES:= ${MASTER_SITE_XORG}
+PKG_SUBPKGS:= XCB_PROTO XCB_PYTHON
+
include $(TOPDIR)/mk/package.mk
$(eval $(call PKG_template,XCB_PROTO,xcb-proto,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
diff --git a/scripts/scan-pkgs.sh b/scripts/scan-pkgs.sh
index e817ee41c..36f861d67 100644
--- a/scripts/scan-pkgs.sh
+++ b/scripts/scan-pkgs.sh
@@ -66,7 +66,6 @@ if [[ -n $ADK_PACKAGE_GPSD ]]; then
fi
if [[ -n $ADK_PACKAGE_FIREFOX ]]; then
- NEED_ZIP="$NEED_ZIP firefox"
NEED_LIBIDL="$NEED_LIBIDL firefox"
NEED_PYTHON="$NEED_PYTHON firefox"
fi