diff options
| -rw-r--r-- | TODO | 3 | ||||
| -rw-r--r-- | package/avahi/Makefile | 2 | ||||
| -rw-r--r-- | package/glib/Makefile | 7 | ||||
| -rw-r--r-- | package/libX11/Makefile | 1 | ||||
| -rw-r--r-- | package/libXau/Makefile | 1 | ||||
| -rw-r--r-- | package/libxcb/Makefile | 2 | ||||
| -rw-r--r-- | scripts/scan-pkgs.sh | 10 |
7 files changed, 17 insertions, 9 deletions
@@ -1,3 +1,5 @@ +- rpath cleanup +- mark c++ packages - add and test brcm 2.6 wireless support - man pages in ipkg/tgz packages (automatic) - automate /etc handling via conffiles @@ -8,7 +10,6 @@ - openssl ocf support check - new package minidlna - wget/curl/ftp download support -- rpath cleanup - busybox update and SuSv3 removal - check rtc support on foxg20 - adkinstall with NTP and hwclock support diff --git a/package/avahi/Makefile b/package/avahi/Makefile index 05ef2a39c..e7615b451 100644 --- a/package/avahi/Makefile +++ b/package/avahi/Makefile @@ -9,7 +9,7 @@ PKG_RELEASE:= 1 PKG_MD5SUM:= a83155a6e29e3988f07e5eea3287b21e PKG_DESCR:= mDNS daemon PKG_SECTION:= dhcp -PKG_DEPENDS:= libavahi libdaemon libexpat gettext +PKG_DEPENDS:= libavahi libdaemon libexpat libintl PKG_BUILDDEP:= libdaemon expat gdbm glib gettext PKG_URL:= http://avahi.org/ PKG_SITES:= http://avahi.org/download/ diff --git a/package/glib/Makefile b/package/glib/Makefile index 8dc9c6339..3c8045392 100644 --- a/package/glib/Makefile +++ b/package/glib/Makefile @@ -9,7 +9,7 @@ PKG_RELEASE:= 1 PKG_MD5SUM:= ad9c80adb624a1ffe3d9753bab8a578a PKG_DESCR:= low-level core library that forms the basis of GTK+ PKG_SECTION:= libs -PKG_DEPENDS:= gettext libiconv libpthread +PKG_DEPENDS:= libintl libiconv libpthread PKG_BUILDDEP:= gettext libiconv PKG_URL:= http://www.gtk.org/ PKG_SITES:= http://ftp.gnome.org/pub/gnome/sources/glib/2.27/ @@ -39,11 +39,12 @@ pre-configure: ifneq ($(OStype),Darwin) (cd ${WRKBUILD}; rm -rf config.{cache,status}; \ ./configure --prefix=$(STAGING_HOST_DIR) \ + --with-libiconv=gnu \ --enable-debug=no \ --with-threads=posix \ ); - ${MAKE} -C ${WRKBUILD}/glib - ${MAKE} -C ${WRKBUILD}/gthread + env CFLAGS="-static" LDFLAGS="-static -liconv" ${MAKE} -C ${WRKBUILD}/glib + env CFLAGS="-static" LDFLAGS="-static" ${MAKE} -C ${WRKBUILD}/gthread env CFLAGS="-static" LDFLAGS="-static" ${MAKE} -C ${WRKBUILD}/gio glib-compile-schemas env CFLAGS="-static" LDFLAGS="-static" ${MAKE} -C ${WRKBUILD}/gobject glib-genmarshal $(CP) ${WRKBUILD}/gio/glib-compile-schemas ${STAGING_HOST_DIR}/bin diff --git a/package/libX11/Makefile b/package/libX11/Makefile index 97d1e0b4b..a5a22e492 100644 --- a/package/libX11/Makefile +++ b/package/libX11/Makefile @@ -27,6 +27,7 @@ include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,LIBX11,libx11,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) $(eval $(call PKG_template,LIBX11_DEV,libx11-dev,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBX11_DEV},${PKGSC_LIBX11_DEV},${PKG_OPTS})) +CONFIGURE_ENV+= CPPFLAGS_FOR_BUILD="-I$(STAGING_TARGET_DIR)/usr/include" CONFIGURE_ARGS+= --enable-xlocale \ --disable-specs \ --disable-xf86bigfont \ diff --git a/package/libXau/Makefile b/package/libXau/Makefile index b85d09216..5ca6c8107 100644 --- a/package/libXau/Makefile +++ b/package/libXau/Makefile @@ -9,6 +9,7 @@ PKG_RELEASE:= 1 PKG_MD5SUM:= ee1ee30c00d1e033cfc0237a349e1219 PKG_DESCR:= X11 authorisation library PKG_SECTION:= x11/libs +PKG_BUILDDEP:= xproto PKG_SITES:= ${MASTER_SITE_XORG} PKG_SUBPKGS:= LIBXAU LIBXAU_DEV diff --git a/package/libxcb/Makefile b/package/libxcb/Makefile index 9f7b71508..5684df06b 100644 --- a/package/libxcb/Makefile +++ b/package/libxcb/Makefile @@ -9,7 +9,7 @@ PKG_RELEASE:= 1 PKG_MD5SUM:= f715e53c9c1b25f856d14d6123663d96 PKG_DESCR:= X11 keyboard library PKG_SECTION:= x11/libs -PKG_BUILDDEP:= python2 libpthread-stubs libxslt libXau +PKG_BUILDDEP:= python2 libpthread-stubs libxslt libXau xcb-proto PKG_SITES:= ${MASTER_SITE_XORG} PKG_SUBPKGS:= LIBXCB LIBXCB_DEVEL diff --git a/scripts/scan-pkgs.sh b/scripts/scan-pkgs.sh index b41556b22..ec64d1550 100644 --- a/scripts/scan-pkgs.sh +++ b/scripts/scan-pkgs.sh @@ -107,6 +107,10 @@ if [[ -n $ADK_PACKAGE_EGLIBC ]]; then NEED_GPERF="$NEED_GPERF eglibc" fi +if [[ -n $ADK_PACKAGE_GLIB ]]; then + NEED_GETTEXT="$NEED_GETTEXT glib" +fi + if [[ -n $ADK_PACKAGE_FONT_BITSTREAM_100DPI ]]; then NEED_MKFONTDIR="$NEED_MKFONTDIR font-bitstream-100dpi" fi @@ -127,9 +131,9 @@ if [[ -n $NEED_GETTEXT ]]; then if ! which gettext >/dev/null 2>&1; then echo >&2 You need gettext to build $NEED_GETTEXT out=1 -# elif ! which msgfmt >/dev/null 2>&1; then -# echo >&2 You need msgfmt to build $NEED_GETTEXT -# out=1 + elif ! which msgfmt >/dev/null 2>&1; then + echo >&2 You need msgfmt to build $NEED_GETTEXT + out=1 fi fi |