From 001b61234478b6c33b3f0b2d65234a813a5c931e Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sat, 5 Feb 2011 12:43:07 +0100 Subject: add more subpackages, divide tools and library --- package/gettext/Makefile | 38 +++++++++++++++++----- .../patch-gettext-tools_gnulib-lib_spawn_in_h | 11 +++++++ 2 files changed, 40 insertions(+), 9 deletions(-) create mode 100644 package/gettext/patches/patch-gettext-tools_gnulib-lib_spawn_in_h diff --git a/package/gettext/Makefile b/package/gettext/Makefile index 76d47acd5..d01eddbc1 100644 --- a/package/gettext/Makefile +++ b/package/gettext/Makefile @@ -5,32 +5,40 @@ include ${TOPDIR}/rules.mk PKG_NAME= gettext PKG_VERSION= 0.18.1.1 -PKG_RELEASE= 1 +PKG_RELEASE= 2 PKG_MD5SUM:= 3dd55b952826d2b32f51308f2f91aa89 PKG_DESCR:= internationalisation library PKG_SECTION:= libs +PKG_BUILDDEP:= libiconv PKG_DEPENDS:= libiconv libpthread -PKG_BUILDDEP:= libiconv libpthread PKG_URL:= http://www.gnu.org/software/gettext/ PKG_SITES:= ${MASTER_SITE_GNU:=gettext/} +PKG_SUBPKGS:= LIBINTL GETTEXT MSGFMT +PKGSD_GETTEXT:= gettext utility +PKSSC_GETTEXT:= misc +PKGSS_GETTEXT:= libintl +PKGSD_MSGFMT:= msgfmt utility +PKGSC_MSGFMT:= misc +PKGSS_MSGFMT:= libintl + ifeq ($(ADK_STATIC),y) PKG_OPTS:= libonly endif -WRKSRC= ${WRKDIR}/${PKG_NAME}-${PKG_VERSION}/gettext-runtime - include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,GETTEXT,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) +$(eval $(call PKG_template,LIBINTL,libintl,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) +$(eval $(call PKG_template,GETTEXT,gettext,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_GETTEXT},${PKGSD_GETTEXT},${PKSSC_GETTEXT})) +$(eval $(call PKG_template,MSGFMT,msgfmt,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_MSGFMT},${PKGSD_MSGFMT},${PKGSC_MSGFMT})) CONFIGURE_ARGS+= --disable-java \ --disable-native-java \ --disable-csharp \ - --enable-nls \ --disable-libasprintf \ --disable-rpath \ --enable-threads=posix \ + --enable-nls \ --disable-openmp \ --with-libiconv-prefix='${STAGING_TARGET_DIR}/usr' \ --with-included-gettext \ @@ -39,10 +47,22 @@ CONFIGURE_ENV+= nls_cv_use_gnu_gettext=yes \ ac_cv_gnu_library_2=no \ gt_use_preinstalled_gnugettext=no -post-install: - ${INSTALL_DIR} ${IDIR_GETTEXT}/usr/lib ${IDIR_GETTEXT}/usr/bin - ${CP} ${WRKINST}/usr/lib/*.so* ${IDIR_GETTEXT}/usr/lib +libintl-install: + ${INSTALL_DIR} ${IDIR_LIBINTL}/usr/lib + ${CP} ${WRKINST}/usr/lib/libintl.so* \ + ${IDIR_LIBINTL}/usr/lib + +gettext-install: + ${INSTALL_DIR} ${IDIR_GETTEXT}/usr/bin $(INSTALL_BIN) $(WRKINST)/usr/bin/gettext \ $(IDIR_GETTEXT)/usr/bin +msgfmt-install: + ${INSTALL_DIR} ${IDIR_MSGFMT}/usr/bin + ${INSTALL_DIR} ${IDIR_MSGFMT}/usr/lib + ${CP} ${WRKINST}/usr/lib/libgettext*so* \ + ${IDIR_MSGFMT}/usr/lib + $(INSTALL_BIN) $(WRKINST)/usr/bin/msgfmt \ + $(IDIR_MSGFMT)/usr/bin + include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/gettext/patches/patch-gettext-tools_gnulib-lib_spawn_in_h b/package/gettext/patches/patch-gettext-tools_gnulib-lib_spawn_in_h new file mode 100644 index 000000000..4497be8f5 --- /dev/null +++ b/package/gettext/patches/patch-gettext-tools_gnulib-lib_spawn_in_h @@ -0,0 +1,11 @@ +--- gettext-0.18.1.1.orig/gettext-tools/gnulib-lib/spawn.in.h 2010-05-24 11:42:46.000000000 +0200 ++++ gettext-0.18.1.1/gettext-tools/gnulib-lib/spawn.in.h 2011-02-04 19:21:02.000000000 +0100 +@@ -31,7 +31,7 @@ + + /* Get definitions of 'struct sched_param' and 'sigset_t'. + But avoid namespace pollution on glibc systems. */ +-#ifndef __GLIBC__ ++#if !defined(__GLIBC__) || defined(__UCLIBC__) + # include + # include + #endif -- cgit v1.2.3 From 4670c380de855e1838c1b373d74b6a3b17046c30 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sat, 5 Feb 2011 12:43:37 +0100 Subject: avoid warning, create empty file for login information --- package/openssh/files/sshd.init | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package/openssh/files/sshd.init b/package/openssh/files/sshd.init index 1a2db6ada..f678349a1 100644 --- a/package/openssh/files/sshd.init +++ b/package/openssh/files/sshd.init @@ -19,7 +19,7 @@ start) if [[ ! -s /etc/ssh/ssh_host_rsa_key ]]; then mkdir -p /etc/ssh if [[ ! -x /usr/bin/ssh-keygen ]]; then - bothlog openssh not starting: SSH private key missing + echo "openssh not starting: SSH private key missing" exit 0 fi echo "openssh: generating SSH private key (RSA)" @@ -30,6 +30,7 @@ start) fi mkdir -p /var/run/sshd mkdir -p /var/empty + touch /var/log/btmp && chmod 600 /var/log/btmp /usr/sbin/sshd ;; stop) -- cgit v1.2.3 From 3b3487b093985fe757afe581de713279ff8fc7e7 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sat, 5 Feb 2011 12:44:16 +0100 Subject: do not link against host libiconv --- package/libiconv/Makefile | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/package/libiconv/Makefile b/package/libiconv/Makefile index 2da817c1e..f27df06c1 100644 --- a/package/libiconv/Makefile +++ b/package/libiconv/Makefile @@ -12,21 +12,30 @@ PKG_SECTION:= libs PKG_URL:= http://www.gnu.org/software/libiconv/ PKG_SITES:= ${MASTER_SITE_GNU:=libiconv/} +PKG_SUBPKGS:= LIBICONV LIBICONV_DEV +PKGSC_LIBICONV_DEV:= devel +PKGSD_LIBICONV_DEV:= header files for libiconv + ifeq ($(ADK_STATIC),y) PKG_OPTS:= libonly endif include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,LIBICONV,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) +$(eval $(call PKG_template,LIBICONV,libiconv,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) +$(eval $(call PKG_template,LIBICONV_DEV,libiconv-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBICONV_DEV},${PKGSC_LIBICONV_DEV})) TARGET_CFLAGS+= -fPIC FAKE_FLAGS+= libdir="${WRKINST}/usr/lib" \ includedir="${WRKINST}/usr/include" \ INSTALL_TARGET= install-lib -post-install: +libiconv-install: ${INSTALL_DIR} ${IDIR_LIBICONV}/usr/lib ${CP} ${WRKINST}/usr/lib/libiconv.so* ${IDIR_LIBICONV}/usr/lib/ +libiconv-dev-install: + ${INSTALL_DIR} ${IDIR_LIBICONV_DEV}/usr/include + ${CP} ${WRKINST}/usr/include/*.h ${IDIR_LIBICONV_DEV}/usr/include + include ${TOPDIR}/mk/pkg-bottom.mk -- cgit v1.2.3 From 99eb047e1594d0f78832ecae5d8b60509c7da6a4 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sat, 5 Feb 2011 12:44:49 +0100 Subject: fix build and runtime dependencies --- TODO | 3 ++- package/avahi/Makefile | 2 +- package/glib/Makefile | 7 ++++--- package/libX11/Makefile | 1 + package/libXau/Makefile | 1 + package/libxcb/Makefile | 2 +- scripts/scan-pkgs.sh | 10 +++++++--- 7 files changed, 17 insertions(+), 9 deletions(-) diff --git a/TODO b/TODO index e433fea29..155948644 100644 --- a/TODO +++ b/TODO @@ -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 -- cgit v1.2.3