diff options
Diffstat (limited to 'package')
111 files changed, 998 insertions, 457 deletions
diff --git a/package/DirectFB/Makefile b/package/DirectFB/Makefile index 45dc3e13f..3f2b8297b 100644 --- a/package/DirectFB/Makefile +++ b/package/DirectFB/Makefile @@ -5,13 +5,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:= DirectFB PKG_VERSION:= 1.4.11 -PKG_RELEASE:= 1 +PKG_RELEASE:= 2 PKG_EXTRAVER:= 1.4-5 PKG_MD5SUM:= 94735ccec21120794adcce93a61445d2 PKG_DESCR:= Thin graphic library for the Linux framebuffer devices PKG_SECTION:= libs PKG_DEPENDS:= libpng libjpeg -PKG_BUILDDEP:= libpng jpeg +PKG_BUILDDEP:= libpng jpeg freetype PKG_URL:= http://www.directfb.org/ PKG_SITES:= http://directfb.org/downloads/Core/DirectFB-1.4/ @@ -26,6 +26,7 @@ $(eval $(call PKG_template,DIRECTFB_DEV,directfb-dev,$(PKG_VERSION)-${PKG_RELEAS CONFIGURE_ARGS+= --with-inputdrivers=linuxinput,keyboard,ps2mouse \ --with-gfxdrivers=none \ + --without-tools \ --enable-fbdev \ --disable-sdl \ --disable-osx \ @@ -43,11 +44,7 @@ ifeq (${ADK_TARGET_SYSTEM_LEMOTE_YEELONG},y) XAKE_FLAGS+= LDEMULATION=elf64ltsmip endif -SUB_INSTALLS-y:= -SUB_INSTALLS-m:= -SUB_INSTALLS-${ADK_PACKAGE_DIRECTFB_DEV}+= directfb-dev-install - -post-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y} +post-install: ${INSTALL_DIR} ${IDIR_DIRECTFB}/etc ${INSTALL_DATA} ./files/directfbrc ${IDIR_DIRECTFB}/etc/ $(INSTALL_DIR) $(IDIR_DIRECTFB)/usr/lib/directfb-${PKG_EXTRAVER}/{inputdrivers,systems,wm} diff --git a/package/DirectFB/patches/patch-configure b/package/DirectFB/patches/patch-configure new file mode 100644 index 000000000..86831102d --- /dev/null +++ b/package/DirectFB/patches/patch-configure @@ -0,0 +1,11 @@ +--- DirectFB-1.4.11.orig/configure 2010-11-15 22:35:38.000000000 +0100 ++++ DirectFB-1.4.11/configure 2011-01-08 11:46:41.000000000 +0100 +@@ -16257,7 +16257,7 @@ if test x"$CFLAGS" = x"-g -O2"; then + CFLAGS= + fi + +-CFLAGS="-O3 -ffast-math -pipe $CFLAGS" ++CFLAGS="-ffast-math -pipe $CFLAGS" + + DFB_INTERNAL_CFLAGS="-D_GNU_SOURCE $DFB_INTERNAL_CFLAGS" + diff --git a/package/ImageMagick/Makefile b/package/ImageMagick/Makefile index 648befeeb..9f16e819e 100644 --- a/package/ImageMagick/Makefile +++ b/package/ImageMagick/Makefile @@ -10,7 +10,7 @@ PKG_RELEASE:= 1 PKG_MD5SUM:= a07a97cfb28b588cbcf83ffa9ec92e3f PKG_DESCR:= image processing and converting utility PKG_SECTION:= multimedia -PKG_BUILDDEP:= jpeg libtiff +PKG_BUILDDEP:= jpeg libtiff fontconfig libiconv PKG_DEPENDS:= libjpeg libtiff PKG_URL:= http://www.imagemagick.org/ PKG_SITES:= http://image_magick.veidrodis.com/image_magick/ @@ -35,14 +35,10 @@ $(eval $(call PKG_template,LIBIMAGEMAGICK,libimagemagick,$(PKG_VERSION)-${PKG_RE $(eval $(call PKG_template,CONVERT,convert,$(PKG_VERSION)-${PKG_RELEASE},${PKGSS_CONVERT},${PKGSD_CONVERT},${PKGSC_CONVERT})) $(eval $(call PKG_template,DISPLAY,display,$(PKG_VERSION)-${PKG_RELEASE},${PKGSS_DISPLAY},${PKGSD_DISPLAY},${PKGSC_DISPLAY})) -SUB_INSTALLS-y:= -SUB_INSTALLS-m:= -SUB_INSTALLS-${ADK_PACKAGE_CONVERT}+= convert-install -SUB_INSTALLS-${ADK_PACKAGE_DISPLAY}+= display-install +CONFIGURE_ARGS+= --with-magick-plus-plus=no \ + --enable-fast-install -CONFIGURE_ARGS+= --with-magick-plus-plus=no - -post-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y} +post-install: $(INSTALL_DIR) $(IDIR_LIBIMAGEMAGICK)/usr/lib $(INSTALL_DIR) $(IDIR_LIBIMAGEMAGICK)/usr/lib/${PKG_NAME}-${PKG_VERSION}/config $(INSTALL_DATA) $(WRKINST)/usr/lib/${PKG_NAME}-${PKG_VERSION}/config/* \ diff --git a/package/ImageMagick/patches/patch-config_ltmain_sh b/package/ImageMagick/patches/patch-config_ltmain_sh new file mode 100644 index 000000000..3c1be111b --- /dev/null +++ b/package/ImageMagick/patches/patch-config_ltmain_sh @@ -0,0 +1,30 @@ +--- ImageMagick-6.6.5-10.orig/config/ltmain.sh 2010-11-21 22:35:22.000000000 +0100 ++++ ImageMagick-6.6.5-10/config/ltmain.sh 2011-01-08 23:20:33.000000000 +0100 +@@ -5843,27 +5843,6 @@ func_mode_link () + esac + fi + +- # Hardcode the library path. +- # Skip directories that are in the system default run-time +- # search path. +- case " $sys_lib_dlsearch_path " in +- *" $absdir "*) ;; +- *) +- case "$compile_rpath " in +- *" $absdir "*) ;; +- *) compile_rpath="$compile_rpath $absdir" +- esac +- ;; +- esac +- case " $sys_lib_dlsearch_path " in +- *" $libdir "*) ;; +- *) +- case "$finalize_rpath " in +- *" $libdir "*) ;; +- *) finalize_rpath="$finalize_rpath $libdir" +- esac +- ;; +- esac + fi # $linkmode,$pass = prog,link... + + if test "$alldeplibs" = yes && diff --git a/package/Makefile b/package/Makefile index 6b49e5d8f..9cf448ff8 100644 --- a/package/Makefile +++ b/package/Makefile @@ -48,9 +48,6 @@ compile: $(REBUILD_PACKAGES) base-files-compile $(COMPILE_PACKAGES) install: base-files-install $(INSTALL_PACKAGES) endif -$(TARGET_DIR): - mkdir -p $(TARGET_DIR) - %-download: $(START_TRACE) "package/$(patsubst %-download,%,$@)-download: " $(MAKE) -C $(patsubst %-download,%,$@) fetch diff --git a/package/alsa-lib/Makefile b/package/alsa-lib/Makefile index 679efb111..fdc0a08cd 100644 --- a/package/alsa-lib/Makefile +++ b/package/alsa-lib/Makefile @@ -25,11 +25,7 @@ $(eval $(call PKG_template,ALSA_LIB_DEV,alsa-lib-dev,${PKG_VERSION}-${PKG_RELEAS CONFIGURE_ARGS+= --disable-python -SUB_INSTALLS-y:= -SUB_INSTALLS-m:= -SUB_INSTALLS-${ADK_PACKAGE_ALSA_LIB_DEV}+= alsa-lib-dev-install - -post-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y} +post-install: ${INSTALL_DIR} ${IDIR_ALSA_LIB}/usr/lib ${IDIR_ALSA_LIB}/usr/share/alsa ${CP} ${WRKINST}/usr/lib/libasound.so* ${IDIR_ALSA_LIB}/usr/lib/ ${CP} ${WRKINST}/usr/share/alsa/* ${IDIR_ALSA_LIB}/usr/share/alsa/ diff --git a/package/asterisk/Makefile b/package/asterisk/Makefile index bdf44fb96..2b1fc70a5 100644 --- a/package/asterisk/Makefile +++ b/package/asterisk/Makefile @@ -44,19 +44,6 @@ $(eval $(call PKG_template,ASTERISK_CODEC_GSM,asterisk-codec-gsm,$(PKG_VERSION)- $(eval $(call PKG_template,ASTERISK_PBX_DUNDI,asterisk-pbx-dundi,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) $(eval $(call PKG_template,ASTERISK_RES_AGI,asterisk-res-agi,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -SUB_INSTALLS-y:= -SUB_INSTALLS-m:= -SUB_INSTALLS-${ADK_PACKAGE_ASTERISK_PGSQL}+= asterisk-pgsql-install -SUB_INSTALLS-${ADK_PACKAGE_ASTERISK_VOICEMAIL}+= asterisk-voicemail-install -SUB_INSTALLS-${ADK_PACKAGE_ASTERISK_SOUNDS}+= asterisk-sounds-install -SUB_INSTALLS-${ADK_PACKAGE_ASTERISK_CHAN_MGCP}+= asterisk-chan-mgcp-install -SUB_INSTALLS-${ADK_PACKAGE_ASTERISK_CHAN_SKINNY}+= asterisk-chan-skinny-install -SUB_INSTALLS-${ADK_PACKAGE_ASTERISK_CHAN_IAX2}+= asterisk-chan-iax2-install -SUB_INSTALLS-${ADK_PACKAGE_ASTERISK_CODEC_SPEEX}+= asterisk-codec-speex-install -SUB_INSTALLS-${ADK_PACKAGE_ASTERISK_CODEC_GSM}+= asterisk-codec-gsm-install -SUB_INSTALLS-${ADK_PACKAGE_ASTERISK_PBX_DUNDI}+= asterisk-pbx-dundi-install -SUB_INSTALLS-${ADK_PACKAGE_ASTERISK_RES_AGI}+= asterisk-res-agi-install - CONFIGURE_ARGS= --with-z=${STAGING_TARGET_DIR}/usr \ --with-ncurses=${STAGING_TARGET_DIR}/usr \ --with-ssl=${STAGING_TARGET_DIR}/usr \ @@ -132,7 +119,7 @@ post-build: tar xzf asterisk-core-sounds-en-gsm-1.4.19.tar.gz ; \ rm asterisk-core-sounds-en-gsm-1.4.19.tar.gz -do-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y} +do-install: $(CP) $(WRKINST)/* $(IDIR_ASTERISK) rm -rf $(IDIR_ASTERISK)/usr/sbin/astgenkey rm -rf $(IDIR_ASTERISK)/usr/bin diff --git a/package/bash/Makefile b/package/bash/Makefile index 11f3f8bad..008d661a7 100644 --- a/package/bash/Makefile +++ b/package/bash/Makefile @@ -17,7 +17,8 @@ include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,BASH,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) CONFIGURE_ENV+= bash_cv_getenv_redef=no -CONFIGURE_ARGS+= --cache-file=/dev/null +CONFIGURE_ARGS+= --disable-rpath \ + --cache-file=/dev/null XAKE_FLAGS+= LIBS_FOR_BUILD='' post-install: diff --git a/package/busybox/Makefile b/package/busybox/Makefile index 6145cb780..bcd582179 100644 --- a/package/busybox/Makefile +++ b/package/busybox/Makefile @@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:= busybox PKG_VERSION:= 1.18.1 -PKG_RELEASE:= 2 +PKG_RELEASE:= 3 PKG_MD5SUM:= f15fe752d8b7012aa5e59f83b88ccb1c PKG_DESCR:= Core utilities for embedded systems PKG_SECTION:= base @@ -23,10 +23,6 @@ include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,BUSYBOX,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) $(eval $(call PKG_template,UDHCPD,udhcpd,${PKG_VERSION}-${PKG_RELEASE},busybox,${PKGSD_UDHCPD},${PKGSC_UDHCPD})) -SUB_INSTALLS-y:= -SUB_INSTALLS-m:= -SUB_INSTALLS-${ADK_PACKAGE_UDHCPD}+= udhcpd-install - CONFIG_STYLE:= manual BUILD_STYLE:= manual INSTALL_STYLE:= manual @@ -56,7 +52,7 @@ else IPKG_ARCH="$(CPU_ARCH)" ARCH="$(ARCH)" HOSTCC="$(HOSTCC)" -C $(WRKBUILD) busybox endif -do-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y} +do-install: ifeq ($(ADK_NATIVE),y) $(MAKE) V=1 \ IPKG_ARCH="$(CPU_ARCH)" ARCH="$(ARCH)" HOSTCC="$(HOSTCC)" -C $(WRKBUILD) install $(MAKE_TRACE) diff --git a/package/busybox/patches/007-missing-headers.patch b/package/busybox/patches/007-missing-headers.patch new file mode 100644 index 000000000..cba28970f --- /dev/null +++ b/package/busybox/patches/007-missing-headers.patch @@ -0,0 +1,10 @@ +--- busybox-1.18.1/include/platform.h~ Mon Dec 20 00:41:03 2010 ++++ busybox-1.18.1/include/platform.h Thu Jan 6 20:03:58 2011 +@@ -155,6 +155,7 @@ + # include <sex.h> + #elif defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) \ + || defined(__APPLE__) ++# include <sys/param.h> /* contains needed types for the following */ + # include <sys/resource.h> /* rlimit */ + # include <machine/endian.h> + # define bswap_64 __bswap64 diff --git a/package/coreutils/Makefile b/package/coreutils/Makefile index 39ab9fddf..8d35c3c8e 100644 --- a/package/coreutils/Makefile +++ b/package/coreutils/Makefile @@ -21,6 +21,8 @@ include $(TOPDIR)/mk/package.mk #$(eval $(call PKG_template,COREUTILS,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) $(eval $(call PKG_template,TSORT,tsort,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_TSORT},${PKGSC_TSORT})) +CONFIGURE_ARGS+= --disable-rpath + post-install: $(INSTALL_DIR) $(IDIR_TSORT)/usr/bin $(INSTALL_BIN) $(WRKINST)/usr/bin/tsort \ diff --git a/package/curl/Makefile b/package/curl/Makefile index ab6e45416..c9992052a 100644 --- a/package/curl/Makefile +++ b/package/curl/Makefile @@ -30,11 +30,6 @@ $(eval $(call PKG_template,CURL,curl,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS $(eval $(call PKG_template,LIBCURL,libcurl,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_LIBCURL},${PKGSD_LIBCURL},${PKGSC_LIBCURL})) $(eval $(call PKG_template,LIBCURL_DEV,libcurl-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBCURL_DEV},${PKGSC_LIBCURL_DEV})) -SUB_INSTALLS-y:= -SUB_INSTALLS-m:= -SUB_INSTALLS-${ADK_PACKAGE_CURL}+= curl-install -SUB_INSTALLS-${ADK_PACKAGE_LIBCURL_DEV}+= libcurl-dev-install - CONFIGURE_ENV+= curl_typeof_curl_socklen_t=socklen_t CONFIGURE_ARGS+= --disable-thread \ --enable-cookies \ @@ -63,7 +58,7 @@ else CONFIGURE_ARGS+= --disable-ipv6 endif -post-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y} +post-install: ${INSTALL_DIR} ${IDIR_LIBCURL}/usr/lib ${CP} ${WRKINST}/usr/lib/libcurl.so* ${IDIR_LIBCURL}/usr/lib/ diff --git a/package/dbus/patches/patch-configure b/package/dbus/patches/patch-configure index f33a192a9..85521d390 100644 --- a/package/dbus/patches/patch-configure +++ b/package/dbus/patches/patch-configure @@ -1,6 +1,6 @@ ---- dbus-1.2.16.orig/configure 2009-07-14 21:43:08.000000000 +0200 -+++ dbus-1.2.16/configure 2010-01-15 19:03:24.000000000 +0100 -@@ -25213,19 +25213,6 @@ if test "x$GCC" = "xyes"; then +--- dbus-1.2.24.orig/configure 2010-03-23 20:11:22.000000000 +0100 ++++ dbus-1.2.24/configure 2011-01-08 22:50:31.000000000 +0100 +@@ -25294,19 +25296,6 @@ if test "x$GCC" = "xyes"; then ;; esac diff --git a/package/dbus/patches/patch-ltmain_sh b/package/dbus/patches/patch-ltmain_sh new file mode 100644 index 000000000..b63e1d647 --- /dev/null +++ b/package/dbus/patches/patch-ltmain_sh @@ -0,0 +1,30 @@ +--- dbus-1.2.24.orig/ltmain.sh 2010-03-12 23:22:29.000000000 +0100 ++++ dbus-1.2.24/ltmain.sh 2011-01-08 22:57:14.000000000 +0100 +@@ -5516,27 +5516,6 @@ func_mode_link () + esac + fi + +- # Hardcode the library path. +- # Skip directories that are in the system default run-time +- # search path. +- case " $sys_lib_dlsearch_path " in +- *" $absdir "*) ;; +- *) +- case "$compile_rpath " in +- *" $absdir "*) ;; +- *) compile_rpath="$compile_rpath $absdir" +- esac +- ;; +- esac +- case " $sys_lib_dlsearch_path " in +- *" $libdir "*) ;; +- *) +- case "$finalize_rpath " in +- *" $libdir "*) ;; +- *) finalize_rpath="$finalize_rpath $libdir" +- esac +- ;; +- esac + fi # $linkmode,$pass = prog,link... + + if test "$alldeplibs" = yes && diff --git a/package/dillo/Makefile b/package/dillo/Makefile index 142bbb1b8..1c2bcf500 100644 --- a/package/dillo/Makefile +++ b/package/dillo/Makefile @@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:= dillo PKG_VERSION:= 2.2 -PKG_RELEASE:= 1 +PKG_RELEASE:= 2 PKG_MD5SUM:= f8bcd62093f178bed81e46cc54e73f42 PKG_DESCR:= small graphical web browser PKG_SECTION:= x11/apps diff --git a/package/dillo/patches/patch-Makefile_in b/package/dillo/patches/patch-Makefile_in new file mode 100644 index 000000000..6b18010d3 --- /dev/null +++ b/package/dillo/patches/patch-Makefile_in @@ -0,0 +1,11 @@ +--- dillo-2.2.orig/Makefile.in 2010-02-11 11:20:01.000000000 +0100 ++++ dillo-2.2/Makefile.in 2011-01-07 21:37:49.000000000 +0100 +@@ -242,7 +242,7 @@ target_vendor = @target_vendor@ + top_build_prefix = @top_build_prefix@ + top_builddir = @top_builddir@ + top_srcdir = @top_srcdir@ +-SUBDIRS = lout dw dlib dpip src doc dpid dpi test ++SUBDIRS = lout dw dlib dpip src doc dpid dpi + EXTRA_DIST = Doxyfile dillorc install-dpi-local + sysconf_DATA = dillorc + all: config.h diff --git a/package/dillo/patches/patch-configure b/package/dillo/patches/patch-configure new file mode 100644 index 000000000..233acb5a8 --- /dev/null +++ b/package/dillo/patches/patch-configure @@ -0,0 +1,14 @@ +--- dillo-2.2.orig/configure 2010-02-11 11:19:59.000000000 +0100 ++++ dillo-2.2/configure 2011-01-07 21:35:04.000000000 +0100 +@@ -5830,11 +5830,6 @@ typedef unsigned char bool_t; + _______EOF + + +-if test "`$CPP -v < /dev/null 2>&1 | grep '/usr/local/include' 2>&1`" = ""; then +- CPPFLAGS="$CPPFLAGS -I/usr/local/include" +- LDFLAGS="$LDFLAGS -L/usr/local/lib" +-fi +- + for ac_func in gethostbyname + do : + ac_fn_c_check_func "$LINENO" "gethostbyname" "ac_cv_func_gethostbyname" diff --git a/package/dillo/patches/patch-src_IO_Makefile_in b/package/dillo/patches/patch-src_IO_Makefile_in new file mode 100644 index 000000000..242d86f5a --- /dev/null +++ b/package/dillo/patches/patch-src_IO_Makefile_in @@ -0,0 +1,11 @@ +--- dillo-2.2.orig/src/IO/Makefile.in 2010-02-11 11:20:01.000000000 +0100 ++++ dillo-2.2/src/IO/Makefile.in 2011-01-07 21:38:15.000000000 +0100 +@@ -188,7 +188,7 @@ top_build_prefix = @top_build_prefix@ + top_builddir = @top_builddir@ + top_srcdir = @top_srcdir@ + AM_CPPFLAGS = -DDILLO_BINDIR='"$(bindir)/"' +-AM_CFLAGS = @LIBFLTK_CFLAGS@ ++AM_CFLAGS = + AM_CXXFLAGS = @LIBFLTK_CXXFLAGS@ + noinst_LIBRARIES = libDiof.a + libDiof_a_SOURCES = \ diff --git a/package/dnsmasq/Makefile b/package/dnsmasq/Makefile index 3586fe165..6bce7db1e 100644 --- a/package/dnsmasq/Makefile +++ b/package/dnsmasq/Makefile @@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= dnsmasq PKG_VERSION:= 2.55 -PKG_RELEASE:= 1 +PKG_RELEASE:= 2 PKG_MD5SUM:= b093d7c6bc7f97ae6fd35d048529232a PKG_DESCR:= A lightweight DNS and DHCP server PKG_SECTION:= dns @@ -17,13 +17,10 @@ include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,DNSMASQ,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) CONFIG_STYLE:= manual -INSTALL_STYLE:= manual -MAKE_FLAGS+= BINDIR=/usr/sbin MANDIR=/usr/man COPTS="${TCFLAGS}" - -do-install: +post-install: ${INSTALL_DIR} ${IDIR_DNSMASQ}/usr/sbin ${IDIR_DNSMASQ}/etc - ${INSTALL_BIN} ${WRKBUILD}/src/dnsmasq ${IDIR_DNSMASQ}/usr/sbin/ + ${INSTALL_BIN} ${WRKINST}/usr/sbin/dnsmasq ${IDIR_DNSMASQ}/usr/sbin/ ${INSTALL_DATA} ./files/dnsmasq.conf ${IDIR_DNSMASQ}/etc/dnsmasq.conf include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/dnsmasq/patches/patch-Makefile b/package/dnsmasq/patches/patch-Makefile new file mode 100644 index 000000000..3bc68e266 --- /dev/null +++ b/package/dnsmasq/patches/patch-Makefile @@ -0,0 +1,20 @@ +--- dnsmasq-2.55.orig/Makefile 2010-06-06 21:22:30.000000000 +0200 ++++ dnsmasq-2.55/Makefile 2011-01-07 21:43:23.000000000 +0100 +@@ -13,7 +13,7 @@ + # You should have received a copy of the GNU General Public License + # along with this program. If not, see <http://www.gnu.org/licenses/>. + +-PREFIX = /usr/local ++PREFIX = /usr + BINDIR = ${PREFIX}/sbin + MANDIR = ${PREFIX}/share/man + LOCALEDIR = ${PREFIX}/share/locale +@@ -24,7 +24,7 @@ MSGMERGE = msgmerge + MSGFMT = msgfmt + XGETTEXT = xgettext + +-CFLAGS = -Wall -W -O2 ++CFLAGS ?= -Wall + + ################################################################# + diff --git a/package/dnsmasq/patches/patch-src_config_h b/package/dnsmasq/patches/patch-src_config_h index 5db49ea9a..c58050bd0 100644 --- a/package/dnsmasq/patches/patch-src_config_h +++ b/package/dnsmasq/patches/patch-src_config_h @@ -1,6 +1,6 @@ ---- dnsmasq-2.47.orig/src/config.h 2009-02-05 13:14:24.000000000 +0100 -+++ dnsmasq-2.47/src/config.h 2009-03-19 18:40:37.000000000 +0100 -@@ -45,7 +45,7 @@ +--- dnsmasq-2.55.orig/src/config.h 2010-06-07 23:01:19.000000000 +0200 ++++ dnsmasq-2.55/src/config.h 2011-01-07 21:40:34.000000000 +0100 +@@ -47,7 +47,7 @@ # elif defined(__sun__) || defined (__sun) # define LEASEFILE "/var/cache/dnsmasq.leases" # else @@ -9,7 +9,7 @@ # endif #endif -@@ -282,8 +282,9 @@ typedef unsigned long in_addr_t; +@@ -269,8 +269,9 @@ NOTES: /* We assume that systems which don't have IPv6 headers don't have ntop and pton either */ diff --git a/package/dosfstools/Makefile b/package/dosfstools/Makefile index 89a3cb861..8f6dee573 100644 --- a/package/dosfstools/Makefile +++ b/package/dosfstools/Makefile @@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= dosfstools PKG_VERSION:= 3.0.9 -PKG_RELEASE:= 1 +PKG_RELEASE:= 2 PKG_MD5SUM:= bd273cf8aa6341c0b52cbac72050bcf4 PKG_DESCR:= Utilities to create and check MS-DOS FAT filesystems PKG_SECTION:= fs @@ -17,9 +17,7 @@ include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,DOSFSTOOLS,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) CONFIG_STYLE:= manual - -XAKE_FLAGS+= PREFIX="" \ - OPTFLAGS="${TARGET_CFLAGS} -D_FILE_OFFSET_BITS=64" +XAKE_FLAGS+= PREFIX="" OPTFLAGS="-D_FILE_OFFSET_BITS=64" post-install: ${INSTALL_DIR} ${IDIR_DOSFSTOOLS}/sbin diff --git a/package/dosfstools/patches/patch-Makefile b/package/dosfstools/patches/patch-Makefile new file mode 100644 index 000000000..c20b7f4dc --- /dev/null +++ b/package/dosfstools/patches/patch-Makefile @@ -0,0 +1,11 @@ +--- dosfstools-3.0.9.orig/Makefile 2009-10-04 11:03:23.000000000 +0200 ++++ dosfstools-3.0.9/Makefile 2011-01-07 21:50:15.000000000 +0100 +@@ -29,7 +29,7 @@ OPTFLAGS = -O2 -fomit-frame-pointer $(sh + #WARNFLAGS = -Wall -pedantic -std=c99 + WARNFLAGS = -Wall + DEBUGFLAGS = -g +-CFLAGS += $(OPTFLAGS) $(WARNFLAGS) $(DEBUGFLAGS) ++CFLAGS += $(WARNFLAGS) + + VPATH = src + diff --git a/package/e2fsprogs/Makefile b/package/e2fsprogs/Makefile index 616979b29..7833cbb8e 100644 --- a/package/e2fsprogs/Makefile +++ b/package/e2fsprogs/Makefile @@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= e2fsprogs PKG_VERSION:= 1.41.14 -PKG_RELEASE:= 1 +PKG_RELEASE:= 2 PKG_MD5SUM:= 05f70470aea2ef7efbb0845b2b116720 PKG_DESCR:= Ext2/3/4 filesystem utilities PKG_SECTION:= fs @@ -36,8 +36,9 @@ $(eval $(call PKG_template,LIBSS,libss,${PKG_VERSION}-${PKG_RELEASE},,${PKGSD_LI $(eval $(call PKG_template,LIBBLKID,libblkid,${PKG_VERSION}-${PKG_RELEASE},,${PKGSD_LIBBLKID},${PKGSC_LIBBLKID})) $(eval $(call PKG_template,E2FSCK_STATIC,e2fsck-static,${PKG_VERSION}-${PKG_RELEASE},,${PKGSD_E2FSCK_STATIC},${PKGSC_E2FSCK_STATIC})) -CONFIGURE_ARGS+= --enable-elf-shlibs --disable-tls +CONFIGURE_ARGS+= --enable-elf-shlibs --disable-rpath INSTALL_TARGET+= install-libs +TLDFLAGS+= -pthread pre-build: ${MAKE} -C ${WRKBUILD}/util \ diff --git a/package/e2fsprogs/patches/patch-debugfs_dump_c.orig b/package/e2fsprogs/patches/patch-debugfs_dump_c.orig deleted file mode 100644 index 7e9b233fa..000000000 --- a/package/e2fsprogs/patches/patch-debugfs_dump_c.orig +++ /dev/null @@ -1,10 +0,0 @@ ---- e2fsprogs-1.41.14.orig/debugfs/dump.c 2009-08-13 03:39:57.000000000 +0200 -+++ e2fsprogs-1.41.14/debugfs/dump.c 2010-12-25 22:27:59.000000000 +0100 -@@ -19,7 +19,6 @@ - #include <sys/types.h> - #include <sys/stat.h> - #include <fcntl.h> --#include <utime.h> - #ifdef HAVE_GETOPT_H - #include <getopt.h> - #else diff --git a/package/e2fsprogs/patches/patch-e2fsck_Makefile_in b/package/e2fsprogs/patches/patch-e2fsck_Makefile_in new file mode 100644 index 000000000..2b43d8cec --- /dev/null +++ b/package/e2fsprogs/patches/patch-e2fsck_Makefile_in @@ -0,0 +1,11 @@ +--- e2fsprogs-1.41.14.orig/e2fsck/Makefile.in 2010-12-22 16:49:20.000000000 +0100 ++++ e2fsprogs-1.41.14/e2fsck/Makefile.in 2011-01-06 23:10:49.000000000 +0100 +@@ -16,7 +16,7 @@ MANPAGES= e2fsck.8 + FMANPAGES= e2fsck.conf.5 + XTRA_CFLAGS= -DRESOURCE_TRACK -I. + +-LIBS= $(LIBEXT2FS) $(LIBCOM_ERR) $(LIBBLKID) $(LIBUUID) $(LIBINTL) $(LIBE2P) ++LIBS= $(LIBEXT2FS) $(LIBCOM_ERR) $(LIBUUID) $(LIBBLKID) $(LIBINTL) $(LIBE2P) + DEPLIBS= $(LIBEXT2FS) $(DEPLIBCOM_ERR) $(DEPLIBBLKID) $(DEPLIBUUID) \ + $(DEPLIBE2P) + diff --git a/package/e2fsprogs/patches/patch-e2fsprogs_spec b/package/e2fsprogs/patches/patch-e2fsprogs_spec deleted file mode 100644 index ad10f98dc..000000000 --- a/package/e2fsprogs/patches/patch-e2fsprogs_spec +++ /dev/null @@ -1,11 +0,0 @@ ---- e2fsprogs-1.41.14.orig/e2fsprogs.spec 2010-12-13 14:57:34.000000000 +0100 -+++ e2fsprogs-1.41.14/e2fsprogs.spec 2010-12-25 22:24:46.000000000 +0100 -@@ -5,7 +5,7 @@ - - Summary: Utilities for managing ext2/ext3/ext4 filesystems - Name: e2fsprogs --Version: 1.41.13 -+Version: 1.41.14 - Release: 0 - License: GPLv2 - Group: System Environment/Base diff --git a/package/eglibc/Makefile b/package/eglibc/Makefile index 27e271f44..844b49876 100644 --- a/package/eglibc/Makefile +++ b/package/eglibc/Makefile @@ -20,14 +20,9 @@ CONFIG_STYLE:= manual BUILD_STYLE:= manual INSTALL_STYLE:= manual -SUB_INSTALLS-y:= -SUB_INSTALLS-m:= -SUB_INSTALLS-${ADK_PACKAGE_EGLIBC_DEV}+= eglibc-dev-install - -EGLIBC_CONFOPTS:= \ - --build=$(GNU_HOST_NAME) \ +EGLIBC_CONFOPTS:= --build=$(GNU_HOST_NAME) \ --host=$(REAL_GNU_TARGET_NAME) \ - --with-headers=$(TOOLCHAIN_SYSROOT)/usr/include \ + --with-headers=$(STAGING_TARGET_DIR)/usr/include \ --disable-nls \ --without-cvs \ --disable-profile \ @@ -51,17 +46,33 @@ EGLIBC_ENV:= PATH='${TARGET_PATH}' \ libc_cv_slibdir="/lib" # compile nothing, eglibc is already build in toolchain directory -do-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y} +do-install: ${INSTALL_DIR} $(IDIR_EGLIBC)/lib $(IDIR_EGLIBC)/etc \ - $(IDIR_EGLIBC)/usr/lib - test -z $(ADK_RUNTIME_TIMEZONE) || \ - $(CP) /usr/share/zoneinfo/$(ADK_RUNTIME_TIMEZONE) \ - $(IDIR_EGLIBC)/etc/localtime + $(IDIR_EGLIBC)/usr/lib + cd ${STAGING_TARGET_DIR} && for f in UTC ${ADK_RUNTIME_TIMEZONE}; do \ + test -s usr/share/zoneinfo/"$$f" || continue; \ + echo usr/share/zoneinfo/"$$f" | \ + ${TOOLS_DIR}/cpio -pdu ${IDIR_EGLIBC}/; \ + done + tz=; cd ${IDIR_EGLIBC}/usr/share/zoneinfo || exit 1; \ + for f in UTC ${ADK_RUNTIME_TIMEZONE}; do \ + test -s "$$f" || continue; \ + tz=$$f; \ + done; if test x"$$tz" = x""; then \ + echo >&2 Error during timezone installation; \ + exit 1; \ + else \ + ln -sf "../usr/share/zoneinfo/$$tz" \ + ${IDIR_EGLIBC}/etc/localtime; \ + fi $(CP) $(STAGING_TARGET_DIR)/lib/ld* $(IDIR_EGLIBC)/lib/ - -for file in libc libcrypt libdl libm libnsl libresolv librt libutil libnss_compat libnss_dns libnss_files; do \ + -for file in libc libcrypt libdl libm libresolv librt libutil libnss_dns libnss_files; do \ $(CP) $(STAGING_TARGET_DIR)/lib/$$file.so* $(IDIR_EGLIBC)/lib/; \ $(CP) $(STAGING_TARGET_DIR)/lib/$$file-$(PKG_VERSION).so $(IDIR_EGLIBC)/lib/; \ done + ${INSTALL_DATA} ${STAGING_TARGET_DIR}/etc/gai.conf ${IDIR_EGLIBC}/etc/ + ${INSTALL_DATA} ${STAGING_TARGET_DIR}/etc/nscd.conf ${IDIR_EGLIBC}/etc/ + ${INSTALL_DATA} ${STAGING_TARGET_DIR}/etc/nsswitch.conf ${IDIR_EGLIBC}/etc/ eglibc-dev-install: ${INSTALL_DIR} $(IDIR_EGLIBC_DEV)/lib $(IDIR_EGLIBC_DEV)/usr/lib @@ -89,6 +100,7 @@ eglibc-dev-install: PATH='${TARGET_PATH}' \ $(MAKE) -C $(WRKBUILD) \ install-headers install-bootstrap-headers=yes + @touch $(IDIR_EGLIBC_DEV)/usr/include/gnu/stubs.h @find $(IDIR_EGLIBC_DEV) -name .install -exec rm {} \; @find $(IDIR_EGLIBC_DEV) -name ..install.cmd -exec rm {} \; # conflicts with libiconv diff --git a/package/expat/Makefile b/package/expat/Makefile index 28fde3a50..0ff841f4c 100644 --- a/package/expat/Makefile +++ b/package/expat/Makefile @@ -25,11 +25,7 @@ include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,LIBEXPAT,libexpat,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) $(eval $(call PKG_template,LIBEXPAT_DEV,libexpat-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBEXPAT_DEV},${PKGSC_LIBEXPAT_DEV})) -SUB_INSTALLS-y:= -SUB_INSTALLS-m:= -SUB_INSTALLS-${ADK_PACKAGE_LIBEXPAT_DEV}+= libexpat-dev-install - -post-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y} +post-install: ${INSTALL_DIR} ${IDIR_LIBEXPAT}/usr/lib ${CP} ${WRKINST}/usr/lib/libexpat.so* ${IDIR_LIBEXPAT}/usr/lib/ diff --git a/package/ffmpeg/Makefile b/package/ffmpeg/Makefile index bfcb74413..082bfe171 100644 --- a/package/ffmpeg/Makefile +++ b/package/ffmpeg/Makefile @@ -27,10 +27,6 @@ include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,FFMPEG,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) $(eval $(call PKG_template,FFPLAY,ffplay,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_FFPLAY},${PKGSD_FFPLAY},${PKGSC_FFPLAY})) -SUB_INSTALLS-y:= -SUB_INSTALLS-m:= -SUB_INSTALLS-${ADK_PACKAGE_FFPLAY}+= ffplay-install - ifeq ($(ADK_TARGET_CPU_WITH_MMX),y) CONFIGURE_CPU_OPTS:= --enable-mmx else @@ -76,7 +72,7 @@ CONFIGURE_ARGS:= --prefix=/usr \ --enable-libfaad \ ${CONFIGURE_CPU_OPTS} -post-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y} +post-install: ${INSTALL_DIR} ${IDIR_FFMPEG}/usr/lib ${CP} ${WRKINST}/usr/lib/libavdevice.so* ${IDIR_FFMPEG}/usr/lib ${CP} ${WRKINST}/usr/lib/libavformat.so* ${IDIR_FFMPEG}/usr/lib diff --git a/package/fltk/patches/patch-fltk2-config_in b/package/fltk/patches/patch-fltk2-config_in new file mode 100644 index 000000000..c4784688a --- /dev/null +++ b/package/fltk/patches/patch-fltk2-config_in @@ -0,0 +1,27 @@ +--- fltk-2.0.x-r7513.orig/fltk2-config.in 2006-04-15 19:43:12.000000000 +0200 ++++ fltk-2.0.x-r7513/fltk2-config.in 2011-01-08 23:34:40.000000000 +0100 +@@ -77,7 +77,6 @@ LDLIBS="@LDFLAGS@ @LIBS@" + # libraries to link with: + LIBNAME="@LIBNAME@" + DSONAME="@DSONAME@" +-DSOLINK="@DSOLINK@" + IMAGELIBS="@IMAGELIBS@" + SHAREDSUFFIX="@SHAREDSUFFIX@" + +@@ -168,7 +167,6 @@ do + bindir=${exec_prefix} + includedir=${prefix}/include + libdir=${prefix}/lib +- DSOLINK="-Wl,-rpath,${prefix}/lib" + ;; + --prefix) + echo_prefix=yes +@@ -283,7 +281,7 @@ if test x$use_images = xyes; then + LDSTATIC="$libdir/libfltk2_images.a $LDSTATIC $IMAGELIBS" + fi + +-LDLIBS="$DSOLINK $LDLIBS" ++LDLIBS="$LDLIBS" + LDSTATIC="$LDSTATIC_PATHS $LDSTATIC" + + # Answer to user requests diff --git a/package/freeglut/Makefile b/package/freeglut/Makefile index fe9b03d0a..b34ac88d8 100644 --- a/package/freeglut/Makefile +++ b/package/freeglut/Makefile @@ -13,7 +13,7 @@ PKG_BUILDDEP:= MesaLib PKG_URL:= http://freeglut.sourceforge.net/ PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=freeglut/} -PKG_HOST_DEPENDS:= !cygwin !darwin +PKG_HOST_DEPENDS:= !cygwin PKG_ARCH_DEPENDS:= x86 x86_64 mips mipsel mips64 mips64el include $(TOPDIR)/mk/package.mk diff --git a/package/gdk-pixbuf/Makefile b/package/gdk-pixbuf/Makefile index f1eedeeb1..b73bc688e 100644 --- a/package/gdk-pixbuf/Makefile +++ b/package/gdk-pixbuf/Makefile @@ -8,6 +8,7 @@ PKG_VERSION:= 2.23.0 PKG_RELEASE:= 2 PKG_MD5SUM:= a7d6c5f2fe2d481149ed3ba807b5c043 PKG_DESCR:= GDK pixbuf library +PKG_BUILDDEP:= jpeg PKG_SECTION:= libs PKG_SITES:= http://ftp.gnome.org/pub/gnome/sources/gdk-pixbuf/2.23/ diff --git a/package/gettext/Makefile b/package/gettext/Makefile index 76e73fed0..76d47acd5 100644 --- a/package/gettext/Makefile +++ b/package/gettext/Makefile @@ -18,7 +18,7 @@ ifeq ($(ADK_STATIC),y) PKG_OPTS:= libonly endif -WRKDIST= ${WRKDIR}/${PKG_NAME}-${PKG_VERSION}/gettext-runtime +WRKSRC= ${WRKDIR}/${PKG_NAME}-${PKG_VERSION}/gettext-runtime include ${TOPDIR}/mk/package.mk @@ -29,6 +29,7 @@ CONFIGURE_ARGS+= --disable-java \ --disable-csharp \ --enable-nls \ --disable-libasprintf \ + --disable-rpath \ --enable-threads=posix \ --disable-openmp \ --with-libiconv-prefix='${STAGING_TARGET_DIR}/usr' \ diff --git a/package/gettext/patches/patch-build-aux_ltmain_sh b/package/gettext/patches/patch-build-aux_ltmain_sh new file mode 100644 index 000000000..9141bd704 --- /dev/null +++ b/package/gettext/patches/patch-build-aux_ltmain_sh @@ -0,0 +1,30 @@ +--- gettext-0.18.1.1.orig/build-aux/ltmain.sh 2010-06-06 14:49:57.000000000 +0200 ++++ gettext-0.18.1.1/build-aux/ltmain.sh 2011-01-08 23:49:55.000000000 +0100 +@@ -5652,27 +5652,6 @@ func_mode_link () + esac + fi + +- # Hardcode the library path. +- # Skip directories that are in the system default run-time +- # search path. +- case " $sys_lib_dlsearch_path " in +- *" $absdir "*) ;; +- *) +- case "$compile_rpath " in +- *" $absdir "*) ;; +- *) compile_rpath="$compile_rpath $absdir" +- esac +- ;; +- esac +- case " $sys_lib_dlsearch_path " in +- *" $libdir "*) ;; +- *) +- case "$finalize_rpath " in +- *" $libdir "*) ;; +- *) finalize_rpath="$finalize_rpath $libdir" +- esac +- ;; +- esac + fi # $linkmode,$pass = prog,link... + + if test "$alldeplibs" = yes && diff --git a/package/glibc/Makefile b/package/glibc/Makefile index 3dee91994..f509e3f3c 100644 --- a/package/glibc/Makefile +++ b/package/glibc/Makefile @@ -20,12 +20,8 @@ CONFIG_STYLE:= manual BUILD_STYLE:= manual INSTALL_STYLE:= manual -SUB_INSTALLS-y:= -SUB_INSTALLS-m:= -SUB_INSTALLS-${ADK_PACKAGE_GLIBC_DEV}+= glibc-dev-install - # compile nothing, glibc is already build in toolchain directory -do-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y} +do-install: ${INSTALL_DIR} $(IDIR_GLIBC)/lib $(IDIR_GLIBC)/etc test -z $(ADK_RUNTIME_TIMEZONE) || \ $(CP) /usr/share/zoneinfo/$(ADK_RUNTIME_TIMEZONE) \ diff --git a/package/gnupg/Makefile b/package/gnupg/Makefile index ff3739775..d28b2b4dc 100644 --- a/package/gnupg/Makefile +++ b/package/gnupg/Makefile @@ -29,6 +29,7 @@ CONFIGURE_ARGS+= --disable-asm \ --disable-finger \ --disable-ftp \ --disable-dns-srv \ + --disable-rpath \ --enable-fake-curl \ --disable-regex diff --git a/package/gtk+/Makefile b/package/gtk+/Makefile index 41972cbbc..dd216bf0b 100644 --- a/package/gtk+/Makefile +++ b/package/gtk+/Makefile @@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= gtk+ PKG_VERSION:= 2.22.1 -PKG_RELEASE:= 1 +PKG_RELEASE:= 2 PKG_MD5SUM:= dd1830395a6b9265a1e1989af7a3c5bf PKG_DESCR:= GTK+ library PKG_SECTION:= libs @@ -25,6 +25,13 @@ include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,LIBGTK,libgtk,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) +CONFIGURE_ARGS+= --disable-gtk-doc-html \ + --disable-modules \ + --disable-xinerama \ + --without-xinput \ + --disable-gtk-doc \ + --disable-papi \ + --disable-introspection CONFIGURE_ENV+= gio_can_sniff=no \ ac_cv_path_GTK_UPDATE_ICON_CACHE="" diff --git a/package/gtk+/patches/patch-Makefile_in b/package/gtk+/patches/patch-Makefile_in new file mode 100644 index 000000000..a3c0845f8 --- /dev/null +++ b/package/gtk+/patches/patch-Makefile_in @@ -0,0 +1,13 @@ +--- gtk+-2.22.1.orig/Makefile.in 2010-11-15 17:49:52.000000000 +0100 ++++ gtk+-2.22.1/Makefile.in 2011-01-07 22:23:19.000000000 +0100 +@@ -455,8 +455,8 @@ XVFB_START = \ + || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ + && DISPLAY=:$$XID && export DISPLAY + +-SRC_SUBDIRS = gdk gtk modules demos tests perf +-SUBDIRS = po po-properties $(SRC_SUBDIRS) docs m4macros build ++SRC_SUBDIRS = gdk gtk modules ++SUBDIRS = po po-properties $(SRC_SUBDIRS) m4macros build + + # require automake 1.4 + AUTOMAKE_OPTIONS = 1.7 diff --git a/package/gtk+/patches/patch-gtk_Makefile_in b/package/gtk+/patches/patch-gtk_Makefile_in new file mode 100644 index 000000000..d2c098b84 --- /dev/null +++ b/package/gtk+/patches/patch-gtk_Makefile_in @@ -0,0 +1,265 @@ +--- gtk+-2.22.1.orig/gtk/Makefile.in 2010-11-15 17:49:47.000000000 +0100 ++++ gtk+-2.22.1/gtk/Makefile.in 2011-01-04 13:33:50.000000000 +0100 +@@ -1595,7 +1595,172 @@ GENERATED_ICONS = \ + stock-icons/24/folder-remote.png \ + stock-icons/24/user-home.png \ + stock-icons/24/user-desktop.png \ +- stock-icons/24/text-x-generic.png ++ stock-icons/24/text-x-generic.png \ ++ stock-icons/16/gtk-quit.png \ ++ stock-icons/16/gtk-info.png \ ++ stock-icons/16/gtk-file.png \ ++ stock-icons/16/gtk-open.png \ ++ stock-icons/16/gtk-print-preview.png \ ++ stock-icons/16/gtk-print.png \ ++ stock-icons/16/gtk-properties.png \ ++ stock-icons/16/gtk-revert-to-saved-ltr.png \ ++ stock-icons/16/gtk-revert-to-saved-rtl.png \ ++ stock-icons/16/gtk-save-as.png \ ++ stock-icons/16/gtk-new.png \ ++ stock-icons/16/gtk-harddisk.png \ ++ stock-icons/16/gtk-clear.png \ ++ stock-icons/16/gtk-copy.png \ ++ stock-icons/16/gtk-cut.png \ ++ stock-icons/16/gtk-delete.png \ ++ stock-icons/16/gtk-find-and-replace.png \ ++ stock-icons/16/gtk-find.png \ ++ stock-icons/16/gtk-paste.png \ ++ stock-icons/16/gtk-redo-ltr.png \ ++ stock-icons/16/gtk-redo-rtl.png \ ++ stock-icons/16/gtk-select-all.png \ ++ stock-icons/16/gtk-undo-ltr.png \ ++ stock-icons/16/gtk-undo-rtl.png \ ++ stock-icons/16/gtk-directory.png \ ++ stock-icons/16/gtk-unindent-ltr.png \ ++ stock-icons/16/gtk-unindent-rtl.png \ ++ stock-icons/16/gtk-indent-ltr.png \ ++ stock-icons/16/gtk-indent-rtl.png \ ++ stock-icons/16/gtk-justify-center.png \ ++ stock-icons/16/gtk-justify-fill.png \ ++ stock-icons/16/gtk-justify-left.png \ ++ stock-icons/16/gtk-justify-right.png \ ++ stock-icons/16/gtk-bold.png \ ++ stock-icons/16/gtk-italic.png \ ++ stock-icons/16/gtk-strikethrough.png \ ++ stock-icons/16/gtk-underline.png \ ++ stock-icons/16/gtk-goto-bottom.png \ ++ stock-icons/16/gtk-go-down.png \ ++ stock-icons/16/gtk-goto-first-ltr.png \ ++ stock-icons/16/gtk-home.png \ ++ stock-icons/16/gtk-jump-to-ltr.png \ ++ stock-icons/16/gtk-jump-to-rtl.png \ ++ stock-icons/16/gtk-goto-last-ltr.png \ ++ stock-icons/16/gtk-go-forward-ltr.png \ ++ stock-icons/16/gtk-go-back-ltr.png \ ++ stock-icons/16/gtk-goto-top.png \ ++ stock-icons/16/gtk-go-up.png \ ++ stock-icons/16/gtk-about.png \ ++ stock-icons/16/gtk-help.png \ ++ stock-icons/16/gtk-missing-image.png \ ++ stock-icons/16/gtk-add.png \ ++ stock-icons/16/gtk-remove.png \ ++ stock-icons/16/gtk-floppy.png \ ++ stock-icons/16/gtk-cdrom.png \ ++ stock-icons/16/gtk-media-pause.png \ ++ stock-icons/16/gtk-media-play-ltr.png \ ++ stock-icons/16/gtk-media-play-rtl.png \ ++ stock-icons/16/gtk-media-stop.png \ ++ stock-icons/16/gtk-media-record.png \ ++ stock-icons/16/gtk-media-rewind-ltr.png \ ++ stock-icons/16/gtk-media-forward-ltr.png \ ++ stock-icons/16/gtk-media-previous-ltr.png \ ++ stock-icons/16/gtk-media-next-ltr.png \ ++ stock-icons/16/gtk-network.png \ ++ stock-icons/16/gtk-print-error.png \ ++ stock-icons/16/gtk-print-report.png \ ++ stock-icons/16/gtk-print-paused.png \ ++ stock-icons/16/gtk-print-warning.png \ ++ stock-icons/16/gtk-stop.png \ ++ stock-icons/16/gtk-execute.png \ ++ stock-icons/16/gtk-spell-check.png \ ++ stock-icons/16/gtk-fullscreen.png \ ++ stock-icons/16/gtk-refresh.png \ ++ stock-icons/16/gtk-leave-fullscreen.png \ ++ stock-icons/16/gtk-sort-ascending.png \ ++ stock-icons/16/gtk-sort-descending.png \ ++ stock-icons/16/gtk-close.png \ ++ stock-icons/16/gtk-zoom-fit.png \ ++ stock-icons/16/gtk-zoom-in.png \ ++ stock-icons/16/gtk-zoom-100.png \ ++ stock-icons/16/gtk-zoom-out.png \ ++ stock-icons/24/gtk-quit.png \ ++ stock-icons/24/gtk-info.png \ ++ stock-icons/24/gtk-file.png \ ++ stock-icons/24/gtk-open.png \ ++ stock-icons/24/gtk-print-preview.png \ ++ stock-icons/24/gtk-print.png \ ++ stock-icons/24/gtk-properties.png \ ++ stock-icons/24/gtk-revert-to-saved-ltr.png \ ++ stock-icons/24/gtk-revert-to-saved-rtl.png \ ++ stock-icons/24/gtk-save-as.png \ ++ stock-icons/24/gtk-new.png \ ++ stock-icons/24/gtk-harddisk.png \ ++ stock-icons/24/gtk-clear.png \ ++ stock-icons/24/gtk-copy.png \ ++ stock-icons/24/gtk-cut.png \ ++ stock-icons/24/gtk-delete.png \ ++ stock-icons/24/gtk-find-and-replace.png \ ++ stock-icons/24/gtk-find.png \ ++ stock-icons/24/gtk-paste.png \ ++ stock-icons/24/gtk-redo-ltr.png \ ++ stock-icons/24/gtk-redo-rtl.png \ ++ stock-icons/24/gtk-select-all.png \ ++ stock-icons/24/gtk-undo-ltr.png \ ++ stock-icons/24/gtk-undo-rtl.png \ ++ stock-icons/24/gtk-directory.png \ ++ stock-icons/24/gtk-unindent-ltr.png \ ++ stock-icons/24/gtk-unindent-rtl.png \ ++ stock-icons/24/gtk-indent-ltr.png \ ++ stock-icons/24/gtk-indent-rtl.png \ ++ stock-icons/24/gtk-justify-center.png \ ++ stock-icons/24/gtk-justify-fill.png \ ++ stock-icons/24/gtk-justify-left.png \ ++ stock-icons/24/gtk-justify-right.png \ ++ stock-icons/24/gtk-bold.png \ ++ stock-icons/24/gtk-italic.png \ ++ stock-icons/24/gtk-strikethrough.png \ ++ stock-icons/24/gtk-underline.png \ ++ stock-icons/24/gtk-goto-bottom.png \ ++ stock-icons/24/gtk-go-down.png \ ++ stock-icons/24/gtk-goto-first-ltr.png \ ++ stock-icons/24/gtk-home.png \ ++ stock-icons/24/gtk-jump-to-ltr.png \ ++ stock-icons/24/gtk-jump-to-rtl.png \ ++ stock-icons/24/gtk-goto-last-ltr.png \ ++ stock-icons/24/gtk-go-forward-ltr.png \ ++ stock-icons/24/gtk-go-back-ltr.png \ ++ stock-icons/24/gtk-goto-top.png \ ++ stock-icons/24/gtk-go-up.png \ ++ stock-icons/24/gtk-about.png \ ++ stock-icons/24/gtk-help.png \ ++ stock-icons/24/gtk-missing-image.png \ ++ stock-icons/24/gtk-add.png \ ++ stock-icons/24/gtk-remove.png \ ++ stock-icons/24/gtk-floppy.png \ ++ stock-icons/24/gtk-cdrom.png \ ++ stock-icons/24/gtk-media-pause.png \ ++ stock-icons/24/gtk-media-play-ltr.png \ ++ stock-icons/24/gtk-media-play-rtl.png \ ++ stock-icons/24/gtk-media-stop.png \ ++ stock-icons/24/gtk-media-record.png \ ++ stock-icons/24/gtk-media-rewind-ltr.png \ ++ stock-icons/24/gtk-media-forward-ltr.png \ ++ stock-icons/24/gtk-media-previous-ltr.png \ ++ stock-icons/24/gtk-media-next-ltr.png \ ++ stock-icons/24/gtk-network.png \ ++ stock-icons/24/gtk-print-error.png \ ++ stock-icons/24/gtk-print-report.png \ ++ stock-icons/24/gtk-print-paused.png \ ++ stock-icons/24/gtk-print-warning.png \ ++ stock-icons/24/gtk-stop.png \ ++ stock-icons/24/gtk-execute.png \ ++ stock-icons/24/gtk-spell-check.png \ ++ stock-icons/24/gtk-fullscreen.png \ ++ stock-icons/24/gtk-refresh.png \ ++ stock-icons/24/gtk-leave-fullscreen.png \ ++ stock-icons/24/gtk-sort-ascending.png \ ++ stock-icons/24/gtk-sort-descending.png \ ++ stock-icons/24/gtk-close.png \ ++ stock-icons/24/gtk-zoom-fit.png \ ++ stock-icons/24/gtk-zoom-in.png \ ++ stock-icons/24/gtk-zoom-100.png \ ++ stock-icons/24/gtk-zoom-out.png ++ + + @CROSS_COMPILING_FALSE@gtk_update_icon_cache_program = \ + @CROSS_COMPILING_FALSE@ ./gtk-update-icon-cache +@@ -2866,6 +3031,88 @@ stamp-icons: $(STOCK_ICONS) + && $(LN_S) folder.png user-desktop.png \ + && $(RM) text-x-generic.png \ + && $(LN_S) document-x-generic.png text-x-generic.png \ ++ && $(LN_S) application-exit.png gtk-quit.png \ ++ && $(LN_S) dialog-info.png gtk-info.png \ ++ && $(LN_S) document-new.png gtk-file.png \ ++ && $(LN_S) document-open.png gtk-open.png \ ++ && $(LN_S) document-print-preview.png gtk-print-preview.png \ ++ && $(LN_S) document-print.png gtk-print.png \ ++ && $(LN_S) document-properties.png gtk-properties.png \ ++ && $(LN_S) document-revert-ltr.png gtk-revert-to-saved-ltr.png \ ++ && $(LN_S) document-revert-rtl.png gtk-revert-to-saved-rtl.png \ ++ && $(LN_S) document-save-as.png gtk-save-as.png \ ++ && $(LN_S) document-x-generic.png gtk-new.png \ ++ && $(LN_S) drive-harddisk.png gtk-harddisk.png \ ++ && $(LN_S) edit-clear.png gtk-clear.png \ ++ && $(LN_S) edit-copy.png gtk-copy.png \ ++ && $(LN_S) edit-cut.png gtk-cut.png \ ++ && $(LN_S) edit-delete.png gtk-delete.png \ ++ && $(LN_S) edit-find-replace.png gtk-find-and-replace.png \ ++ && $(LN_S) edit-find.png gtk-find.png \ ++ && $(LN_S) edit-paste.png gtk-paste.png \ ++ && $(LN_S) edit-redo-ltr.png gtk-redo-ltr.png \ ++ && $(LN_S) edit-redo-rtl.png gtk-redo-rtl.png \ ++ && $(LN_S) edit-select-all.png gtk-select-all.png \ ++ && $(LN_S) edit-undo-ltr.png gtk-undo-ltr.png \ ++ && $(LN_S) edit-undo-rtl.png gtk-undo-rtl.png \ ++ && $(LN_S) folder.png gtk-directory.png \ ++ && $(LN_S) format-indent-less-ltr.png gtk-unindent-ltr.png \ ++ && $(LN_S) format-indent-less-rtl.png gtk-unindent-rtl.png \ ++ && $(LN_S) format-indent-more-ltr.png gtk-indent-ltr.png \ ++ && $(LN_S) format-indent-more-rtl.png gtk-indent-rtl.png \ ++ && $(LN_S) format-justify-center.png gtk-justify-center.png \ ++ && $(LN_S) format-justify-fill.png gtk-justify-fill.png \ ++ && $(LN_S) format-justify-left.png gtk-justify-left.png \ ++ && $(LN_S) format-justify-right.png gtk-justify-right.png \ ++ && $(LN_S) format-text-bold.png gtk-bold.png \ ++ && $(LN_S) format-text-italic.png gtk-italic.png \ ++ && $(LN_S) format-text-strikethrough.png gtk-strikethrough.png \ ++ && $(LN_S) format-text-underline.png gtk-underline.png \ ++ && $(LN_S) go-bottom.png gtk-goto-bottom.png \ ++ && $(LN_S) go-down.png gtk-go-down.png \ ++ && $(LN_S) go-first-ltr.png gtk-goto-first-ltr.png \ ++ && $(LN_S) go-home.png gtk-home.png \ ++ && $(LN_S) go-jump-ltr.png gtk-jump-to-ltr.png \ ++ && $(LN_S) go-jump-rtl.png gtk-jump-to-rtl.png \ ++ && $(LN_S) go-last-ltr.png gtk-goto-last-ltr.png \ ++ && $(LN_S) go-next-ltr.png gtk-go-forward-ltr.png \ ++ && $(LN_S) go-previous-ltr.png gtk-go-back-ltr.png \ ++ && $(LN_S) go-top.png gtk-goto-top.png \ ++ && $(LN_S) go-up.png gtk-go-up.png \ ++ && $(LN_S) help-about.png gtk-about.png \ ++ && $(LN_S) help-contents.png gtk-help.png \ ++ && $(LN_S) image-missing.png gtk-missing-image.png \ ++ && $(LN_S) list-add.png gtk-add.png \ ++ && $(LN_S) list-remove.png gtk-remove.png \ ++ && $(LN_S) media-floppy.png gtk-floppy.png \ ++ && $(LN_S) media-optical.png gtk-cdrom.png \ ++ && $(LN_S) media-playback-pause.png gtk-media-pause.png \ ++ && $(LN_S) media-playback-start-ltr.png gtk-media-play-ltr.png \ ++ && $(LN_S) media-playback-start-rtl.png gtk-media-play-rtl.png \ ++ && $(LN_S) media-playback-stop.png gtk-media-stop.png \ ++ && $(LN_S) media-record.png gtk-media-record.png \ ++ && $(LN_S) media-seek-backward-ltr.png gtk-media-rewind-ltr.png \ ++ && $(LN_S) media-seek-forward-ltr.png gtk-media-forward-ltr.png \ ++ && $(LN_S) media-skip-backward-ltr.png gtk-media-previous-ltr.png \ ++ && $(LN_S) media-skip-forward-ltr.png gtk-media-next-ltr.png \ ++ && $(LN_S) network-idle.png gtk-network.png \ ++ && $(LN_S) printer-error.png gtk-print-error.png \ ++ && $(LN_S) printer-info.png gtk-print-report.png \ ++ && $(LN_S) printer-paused.png gtk-print-paused.png \ ++ && $(LN_S) printer-warning.png gtk-print-warning.png \ ++ && $(LN_S) process-stop.png gtk-stop.png \ ++ && $(LN_S) system-run.png gtk-execute.png \ ++ && $(LN_S) tools-check-spelling.png gtk-spell-check.png \ ++ && $(LN_S) view-fullscreen.png gtk-fullscreen.png \ ++ && $(LN_S) view-refresh.png gtk-refresh.png \ ++ && $(LN_S) view-restore.png gtk-leave-fullscreen.png \ ++ && $(LN_S) view-sort-ascending.png gtk-sort-ascending.png \ ++ && $(LN_S) view-sort-descending.png gtk-sort-descending.png \ ++ && $(LN_S) window-close.png gtk-close.png \ ++ && $(LN_S) zoom-fit-best.png gtk-zoom-fit.png \ ++ && $(LN_S) zoom-in.png gtk-zoom-in.png \ ++ && $(LN_S) zoom-original.png gtk-zoom-100.png \ ++ && $(LN_S) zoom-out.png gtk-zoom-out.png \ + ) done \ + && touch stamp-icons + diff --git a/package/gtk+/patches/patch-gtk_gtktypefuncs_c b/package/gtk+/patches/patch-gtk_gtktypefuncs_c new file mode 100644 index 000000000..8328bf01c --- /dev/null +++ b/package/gtk+/patches/patch-gtk_gtktypefuncs_c @@ -0,0 +1,78 @@ +--- gtk+-2.22.1.orig/gtk/gtktypefuncs.c 2010-11-15 18:05:27.000000000 +0100 ++++ gtk+-2.22.1/gtk/gtktypefuncs.c 2011-01-04 00:15:34.000000000 +0100 +@@ -53,8 +53,8 @@ + *tp++ = gdk_pixbuf_simple_anim_get_type(); + *tp++ = gdk_pixbuf_simple_anim_iter_get_type(); + *tp++ = gdk_pixmap_get_type(); +-*tp++ = gdk_property_state_get_type(); + *tp++ = gdk_prop_mode_get_type(); ++*tp++ = gdk_property_state_get_type(); + *tp++ = gdk_rectangle_get_type(); + *tp++ = gdk_rgb_dither_get_type(); + *tp++ = gdk_screen_get_type(); +@@ -190,14 +190,14 @@ + *tp++ = gtk_icon_view_drop_position_get_type(); + *tp++ = gtk_icon_view_get_type(); + *tp++ = gtk_identifier_get_type(); +-*tp++ = gtk_image_get_type(); +-*tp++ = gtk_image_menu_item_get_type(); +-*tp++ = gtk_image_type_get_type(); + *tp++ = gtk_im_context_get_type(); + *tp++ = gtk_im_context_simple_get_type(); + *tp++ = gtk_im_multicontext_get_type(); + *tp++ = gtk_im_preedit_style_get_type(); + *tp++ = gtk_im_status_style_get_type(); ++*tp++ = gtk_image_get_type(); ++*tp++ = gtk_image_menu_item_get_type(); ++*tp++ = gtk_image_type_get_type(); + *tp++ = gtk_info_bar_get_type(); + *tp++ = gtk_invisible_get_type(); + *tp++ = gtk_item_get_type(); +@@ -282,10 +282,10 @@ + *tp++ = gtk_ruler_get_type(); + *tp++ = gtk_scale_button_get_type(); + *tp++ = gtk_scale_get_type(); +-*tp++ = gtk_scrollbar_get_type(); +-*tp++ = gtk_scrolled_window_get_type(); + *tp++ = gtk_scroll_step_get_type(); + *tp++ = gtk_scroll_type_get_type(); ++*tp++ = gtk_scrollbar_get_type(); ++*tp++ = gtk_scrolled_window_get_type(); + *tp++ = gtk_selection_data_get_type(); + *tp++ = gtk_selection_mode_get_type(); + *tp++ = gtk_sensitivity_type_get_type(); +@@ -302,11 +302,11 @@ + *tp++ = gtk_sort_type_get_type(); + *tp++ = gtk_spin_button_get_type(); + *tp++ = gtk_spin_button_update_policy_get_type(); +-*tp++ = gtk_spinner_get_type(); + *tp++ = gtk_spin_type_get_type(); ++*tp++ = gtk_spinner_get_type(); + *tp++ = gtk_state_type_get_type(); +-*tp++ = gtk_statusbar_get_type(); + *tp++ = gtk_status_icon_get_type(); ++*tp++ = gtk_statusbar_get_type(); + *tp++ = gtk_style_get_type(); + *tp++ = gtk_submenu_direction_get_type(); + *tp++ = gtk_submenu_placement_get_type(); +@@ -330,16 +330,16 @@ + *tp++ = gtk_toggle_action_get_type(); + *tp++ = gtk_toggle_button_get_type(); + *tp++ = gtk_toggle_tool_button_get_type(); +-*tp++ = gtk_toolbar_child_type_get_type(); +-*tp++ = gtk_toolbar_get_type(); +-*tp++ = gtk_toolbar_space_style_get_type(); +-*tp++ = gtk_toolbar_style_get_type(); + *tp++ = gtk_tool_button_get_type(); + *tp++ = gtk_tool_item_get_type(); + *tp++ = gtk_tool_item_group_get_type(); + *tp++ = gtk_tool_palette_drag_targets_get_type(); + *tp++ = gtk_tool_palette_get_type(); + *tp++ = gtk_tool_shell_get_type(); ++*tp++ = gtk_toolbar_child_type_get_type(); ++*tp++ = gtk_toolbar_get_type(); ++*tp++ = gtk_toolbar_space_style_get_type(); ++*tp++ = gtk_toolbar_style_get_type(); + *tp++ = gtk_tooltip_get_type(); + *tp++ = gtk_tree_drag_dest_get_type(); + *tp++ = gtk_tree_drag_source_get_type(); diff --git a/package/hostapd/files/hostapd.config b/package/hostapd/files/hostapd.config index 1ac8a7838..205482fc5 100644 --- a/package/hostapd/files/hostapd.config +++ b/package/hostapd/files/hostapd.config @@ -33,3 +33,4 @@ CONFIG_NO_VLAN=y # This can be used to reduce binary size at the cost of disabling a debugging # option. CONFIG_NO_DUMP_STATE=y +CONFIG_LIBNL20=y diff --git a/package/iptables/Makefile b/package/iptables/Makefile index aac6179a0..d9229dc50 100644 --- a/package/iptables/Makefile +++ b/package/iptables/Makefile @@ -37,9 +37,7 @@ $(eval $(call PKG_template,IP6TABLES,ip6tables,${PKG_VERSION}-${PKG_RELEASE},${P CONFIGURE_ARGS+= --enable-devel -SUB_INSTALL-${ADK_PACKAGE_IP6TABLES}+= ip6tables-install - -post-install: ${SUB_INSTALL-m} ${SUB_INSTALL-y} +post-install: ${INSTALL_DIR} ${IDIR_IPTABLES}/{usr/lib,etc,usr/sbin} ${INSTALL_DATA} ./files/firewall.conf ${IDIR_IPTABLES}/etc ${CP} ${WRKINST}/usr/sbin/iptables* ${IDIR_IPTABLES}/usr/sbin/ diff --git a/package/irssi/patches/patch-build-aux_ltmain_sh b/package/irssi/patches/patch-build-aux_ltmain_sh new file mode 100644 index 000000000..05bcb0e77 --- /dev/null +++ b/package/irssi/patches/patch-build-aux_ltmain_sh @@ -0,0 +1,30 @@ +--- irssi-0.8.15.orig/build-aux/ltmain.sh 2010-04-03 18:21:23.000000000 +0200 ++++ irssi-0.8.15/build-aux/ltmain.sh 2011-01-09 00:18:54.000000000 +0100 +@@ -5516,27 +5516,6 @@ func_mode_link () + esac + fi + +- # Hardcode the library path. +- # Skip directories that are in the system default run-time +- # search path. +- case " $sys_lib_dlsearch_path " in +- *" $absdir "*) ;; +- *) +- case "$compile_rpath " in +- *" $absdir "*) ;; +- *) compile_rpath="$compile_rpath $absdir" +- esac +- ;; +- esac +- case " $sys_lib_dlsearch_path " in +- *" $libdir "*) ;; +- *) +- case "$finalize_rpath " in +- *" $libdir "*) ;; +- *) finalize_rpath="$finalize_rpath $libdir" +- esac +- ;; +- esac + fi # $linkmode,$pass = prog,link... + + if test "$alldeplibs" = yes && diff --git a/package/iw/Makefile b/package/iw/Makefile index 6510063a9..679377b89 100644 --- a/package/iw/Makefile +++ b/package/iw/Makefile @@ -4,9 +4,9 @@ include ${TOPDIR}/rules.mk PKG_NAME:= iw -PKG_VERSION:= 0.9.19 +PKG_VERSION:= 0.9.21 PKG_RELEASE:= 1 -PKG_MD5SUM:= 3b88743f9c6ce8a7e2f5fd7d18fdea42 +PKG_MD5SUM:= 726db5f1fd6bc316434414770513ef81 PKG_DESCR:= Tools for setting up WiFi cards via netlink (nl80211) PKG_SECTION:= wifi PKG_DEPENDS:= libnl diff --git a/package/iw/patches/patch-Makefile b/package/iw/patches/patch-Makefile deleted file mode 100644 index 4c95aee80..000000000 --- a/package/iw/patches/patch-Makefile +++ /dev/null @@ -1,15 +0,0 @@ ---- iw-0.9.18.orig/Makefile 2009-11-20 17:35:56.000000000 +0100 -+++ iw-0.9.18/Makefile 2010-01-04 23:00:34.031210816 +0100 -@@ -86,10 +86,10 @@ check: - install: iw iw.8.gz - @$(NQ) ' INST iw' - $(Q)$(MKDIR) $(DESTDIR)$(SBINDIR) -- $(Q)$(INSTALL) -m 755 -t $(DESTDIR)$(SBINDIR) iw -+ $(Q)$(INSTALL) -m 755 iw $(DESTDIR)$(SBINDIR) - @$(NQ) ' INST iw.8' - $(Q)$(MKDIR) $(DESTDIR)$(MANDIR)/man8/ -- $(Q)$(INSTALL) -m 644 -t $(DESTDIR)$(MANDIR)/man8/ iw.8.gz -+ $(Q)$(INSTALL) -m 644 iw.8.gz $(DESTDIR)$(MANDIR)/man8/ - - clean: - $(Q)rm -f iw *.o *~ *.gz version.c *-stamp diff --git a/package/iw/patches/patch-version_sh b/package/iw/patches/patch-version_sh index dfc939354..296ac974c 100644 --- a/package/iw/patches/patch-version_sh +++ b/package/iw/patches/patch-version_sh @@ -1,5 +1,5 @@ ---- iw-0.9.17.orig/version.sh 2009-08-26 11:41:41.000000000 +0200 -+++ iw-0.9.17/version.sh 2009-11-20 23:11:10.000000000 +0100 +--- iw-0.9.21.orig/version.sh 2010-09-24 17:44:07.000000000 +0200 ++++ iw-0.9.21/version.sh 2011-01-09 22:41:17.000000000 +0100 @@ -5,20 +5,6 @@ OUT="$1" echo '#include "iw.h"' > "$OUT" diff --git a/package/jpeg/Makefile b/package/jpeg/Makefile index b4609e757..911e5c474 100644 --- a/package/jpeg/Makefile +++ b/package/jpeg/Makefile @@ -27,11 +27,7 @@ include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,LIBJPEG,libjpeg,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) $(eval $(call PKG_template,JPEG_DEV,libjpeg-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_JPEG_DEV},${PKGSC_JPEG_DEV})) -SUB_INSTALLS-y:= -SUB_INSTALLS-m:= -SUB_INSTALLS-${ADK_PACKAGE_JPEG_DEV}+= jpeg-dev-install - -post-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y} +post-install: ${INSTALL_DIR} ${IDIR_LIBJPEG}/usr/lib ${CP} ${WRKINST}/usr/lib/libjpeg.so* ${IDIR_LIBJPEG}/usr/lib/ diff --git a/package/krb5/Makefile b/package/krb5/Makefile index 3e49475b6..c7ec9955d 100644 --- a/package/krb5/Makefile +++ b/package/krb5/Makefile @@ -27,10 +27,6 @@ include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,KRB5_SERVER,krb5-server,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) $(eval $(call PKG_template,LIBKRB5,libkrb5,$(PKG_VERSION)-${PKG_RELEASE},,${PKGSD_LIBKRB5},${PKGSC_LIBKRB5})) -SUB_INSTALLS-y:= -SUB_INSTALLS-m:= -SUB_INSTALLS-${ADK_PACKAGE_LIBKRB5}+= libkrb5-install - TCFLAGS+= -I${STAGING_TARGET_DIR}/usr/include/et CONFIGURE_ARGS+= --disable-static \ --disable-profiled \ @@ -50,7 +46,7 @@ pre-build: # fix nm call in script, we need the GNU version of nm $(SED) "s#@@NM@@#${NM}#" ${WRKSRC}/util/export-check.pl -post-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y} +post-install: ${INSTALL_DIR} ${IDIR_KRB5_SERVER}/etc ${INSTALL_DIR} ${IDIR_KRB5_SERVER}/etc/krb5kdc ${INSTALL_DIR} ${IDIR_KRB5_SERVER}/usr/sbin diff --git a/package/krb5/patches/patch-src_krb5-config_in b/package/krb5/patches/patch-src_krb5-config_in new file mode 100644 index 000000000..ddc0159a6 --- /dev/null +++ b/package/krb5/patches/patch-src_krb5-config_in @@ -0,0 +1,22 @@ +--- krb5-1.8.1.orig/src/krb5-config.in 2010-01-21 23:49:01.000000000 +0100 ++++ krb5-1.8.1/src/krb5-config.in 2011-01-09 01:33:14.000000000 +0100 +@@ -34,8 +34,6 @@ libdir=@libdir@ + CC_LINK='@CC_LINK@' + KDB5_DB_LIB=@KDB5_DB_LIB@ + LDFLAGS='@LDFLAGS@' +-RPATH_FLAG='@RPATH_FLAG@' +-PROG_RPATH_FLAGS='@PROG_RPATH_FLAGS@' + PTHREAD_CFLAGS='@PTHREAD_CFLAGS@' + DL_LIB='@DL_LIB@' + +@@ -180,10 +178,7 @@ if test -n "$do_libs"; then + # Ugly gross hack for our build tree + lib_flags=`echo $CC_LINK | sed -e 's/\$(CC)//' \ + -e 's/\$(PURE)//' \ +- -e 's#\$(PROG_RPATH_FLAGS)#'"$PROG_RPATH_FLAGS"'#' \ +- -e 's#\$(PROG_RPATH)#'$libdir'#' \ + -e 's#\$(PROG_LIBPATH)#'$libdirarg'#' \ +- -e 's#\$(RPATH_FLAG)#'"$RPATH_FLAG"'#' \ + -e 's#\$(LDFLAGS)#'"$LDFLAGS"'#' \ + -e 's#\$(PTHREAD_CFLAGS)#'"$PTHREAD_CFLAGS"'#' \ + -e 's#\$(CFLAGS)#'"$CFLAGS"'#'` diff --git a/package/libX11/Makefile b/package/libX11/Makefile index 92f1f52aa..322c190a7 100644 --- a/package/libX11/Makefile +++ b/package/libX11/Makefile @@ -26,10 +26,6 @@ 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})) -SUB_INSTALLS-y:= -SUB_INSTALLS-m:= -SUB_INSTALLS-${ADK_PACKAGE_LIBX11_DEV}+=libx11-dev-install - XAKE_FLAGS+= HOSTCPPFLAGS=-I${STAGING_TARGET_DIR}/usr/include/xproto CONFIGURE_ARGS+= --enable-xlocale \ --disable-specs \ @@ -37,7 +33,7 @@ CONFIGURE_ARGS+= --enable-xlocale \ --disable-malloc0returnsnull \ --without-xcb -post-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y} +post-install: ${INSTALL_DIR} ${IDIR_LIBX11}/usr/lib ${IDIR_LIBX11}/usr/share/X11 ${CP} ${WRKINST}/usr/lib/libX11.so* ${IDIR_LIBX11}/usr/lib/ ${CP} ${WRKINST}/usr/share/X11/XKeysymDB ${IDIR_LIBX11}/usr/share/X11 diff --git a/package/libXau/Makefile b/package/libXau/Makefile index 21d31154e..41d6adcaf 100644 --- a/package/libXau/Makefile +++ b/package/libXau/Makefile @@ -24,12 +24,7 @@ include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,LIBXAU,libxau,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) $(eval $(call PKG_template,LIBXAU_DEV,libxau-dev,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBXAU_DEV},${PKGSC_LIBXAU_DEV},${PKG_OPTS})) -SUB_INSTALLS-y:= -SUB_INSTALLS-m:= -SUB_INSTALLS-${ADK_PACKAGE_LIBXAU_DEV}+=libxau-dev-install - - -post-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y} +post-install: ${INSTALL_DIR} ${IDIR_LIBXAU}/usr/lib ${CP} ${WRKINST}/usr/lib/libXau.so* ${IDIR_LIBXAU}/usr/lib/ diff --git a/package/libXcomposite/Makefile b/package/libXcomposite/Makefile index fc395a708..48b1e3c82 100644 --- a/package/libXcomposite/Makefile +++ b/package/libXcomposite/Makefile @@ -25,13 +25,9 @@ include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,LIBXCOMPOSITE,libxcomposite,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) $(eval $(call PKG_template,LIBXCOMPOSITE_DEV,libxcomposite-dev,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBXCOMPOSITE_DEV},${PKGSC_LIBXCOMPOSITE_DEV},${PKG_OPTS})) -SUB_INSTALLS-y:= -SUB_INSTALLS-m:= -SUB_INSTALLS-${ADK_PACKAGE_LIBXCOMPOSITE_DEV}+= libxcomposite-dev-install - CONFIGURE_ARGS+= --disable-malloc0returnsnull -post-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y} +post-install: ${INSTALL_DIR} ${IDIR_LIBXCOMPOSITE}/usr/lib ${CP} ${WRKINST}/usr/lib/libXcomposite.so* ${IDIR_LIBXCOMPOSITE}/usr/lib/ diff --git a/package/libXdmcp/Makefile b/package/libXdmcp/Makefile index f4a731f9c..4181933ca 100644 --- a/package/libXdmcp/Makefile +++ b/package/libXdmcp/Makefile @@ -24,11 +24,7 @@ include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,LIBXDMCP,libxdmcp,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) $(eval $(call PKG_template,LIBXDMCP_DEV,libxdmcp-dev,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBXDMCP_DEV},${PKGSC_LIBXDMCP_DEV},${PKG_OPTS})) -SUB_INSTALLS-y:= -SUB_INSTALLS-m:= -SUB_INSTALLS-${ADK_PACKAGE_LIBXDMCP_DEV}+=libxdmcp-dev-install - -post-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y} +post-install: ${INSTALL_DIR} ${IDIR_LIBXDMCP}/usr/lib ${CP} ${WRKINST}/usr/lib/libXdmcp.so* ${IDIR_LIBXDMCP}/usr/lib/ @@ -37,5 +33,4 @@ libxdmcp-dev-install: ${CP} ${WRKINST}/usr/include/X11/* \ ${IDIR_LIBXDMCP_DEV}/usr/include/X11/ - include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/libXext/Makefile b/package/libXext/Makefile index 3763d444f..ec311b067 100644 --- a/package/libXext/Makefile +++ b/package/libXext/Makefile @@ -25,13 +25,9 @@ include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,LIBXEXT,libxext,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) $(eval $(call PKG_template,LIBXEXT_DEV,libxext-dev,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBXEXT_DEV},${PKGSC_LIBXEXT_DEV},${PKG_OPTS})) -SUB_INSTALLS-y:= -SUB_INSTALLS-m:= -SUB_INSTALLS-${ADK_PACKAGE_LIBXEXT_DEV}+=libxext-dev-install - CONFIGURE_ARGS+= --disable-malloc0returnsnull -post-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y} +post-install: ${INSTALL_DIR} ${IDIR_LIBXEXT}/usr/lib ${CP} ${WRKINST}/usr/lib/libXext.so* ${IDIR_LIBXEXT}/usr/lib/ diff --git a/package/libelf/Makefile b/package/libelf/Makefile index a5847bc87..c8ae86b32 100644 --- a/package/libelf/Makefile +++ b/package/libelf/Makefile @@ -2,18 +2,17 @@ # material, please see the LICENCE file in the top-level directory. include ${TOPDIR}/rules.mk +include ${TOPDIR}/toolchain/libelf/Makefile.inc -PKG_NAME:= libelf -PKG_VERSION:= 0.8.11 -PKG_RELEASE:= 1 -PKG_MD5SUM:= e931910b6d100f6caa32239849947fbf PKG_DESCR:= elf library PKG_SECTION:= libs PKG_SITES:= http://www.mr511.de/software/ +PKG_SUBPKGS:= LIBELF + include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,LIBELF,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +$(eval $(call PKG_template,LIBELF,libelf,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) CONFIGURE_ENV+= mr_cv_target_elf=yes \ ac_cv_sizeof_long_long=8 @@ -21,7 +20,7 @@ CONFIGURE_ARGS+= --enable-elf64=yes \ --disable-sanity-checks FAKE_FLAGS+= instroot="${WRKINST}" -post-install: +libelf-install: ${INSTALL_DIR} ${IDIR_LIBELF}/usr/lib ${CP} ${WRKINST}/usr/lib/libelf.so* ${IDIR_LIBELF}/usr/lib/ diff --git a/package/libevent/Makefile b/package/libevent/Makefile index 829162b10..a11099ab0 100644 --- a/package/libevent/Makefile +++ b/package/libevent/Makefile @@ -21,11 +21,7 @@ include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,LIBEVENT,${PKG_NAME},$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) $(eval $(call PKG_template,LIBEVENT_DEV,libevent-dev,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBEVENT_DEV},${PKGSC_LIBEVENT_DEV})) -SUB_INSTALLS-y:= -SUB_INSTALLS-m:= -SUB_INSTALLS-${ADK_PACKAGE_LIBEVENT_DEV}+= libevent-dev-install - -post-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y} +post-install: $(INSTALL_DIR) $(IDIR_LIBEVENT)/usr/lib $(CP) $(WRKINST)/usr/lib/libevent*.so* \ $(IDIR_LIBEVENT)/usr/lib/ diff --git a/package/libmad/Makefile b/package/libmad/Makefile index 05cd0a948..0b708732d 100644 --- a/package/libmad/Makefile +++ b/package/libmad/Makefile @@ -30,10 +30,6 @@ endif #FPM:=mips #endif -SUB_INSTALLS-y:= -SUB_INSTALLS-m:= -SUB_INSTALLS-${ADK_PACKAGE_LIBMAD_DEV}+= libmad-dev-install - CONFIGURE_ARGS+= --enable-fpm=${FPM} \ --disable-debugging \ --enable-speed @@ -42,7 +38,7 @@ pre-install: ${INSTALL_DIR} ${WRKINST}/usr/lib/pkgconfig ${CP} ./files/mad.pc ${WRKINST}/usr/lib/pkgconfig -post-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y} +post-install: ${INSTALL_DIR} ${IDIR_LIBMAD}/usr/lib ${CP} ${WRKINST}/usr/lib/libmad.so* ${IDIR_LIBMAD}/usr/lib/ diff --git a/package/libnl/Makefile b/package/libnl/Makefile index d7021a844..6b9d7be87 100644 --- a/package/libnl/Makefile +++ b/package/libnl/Makefile @@ -4,12 +4,13 @@ include ${TOPDIR}/rules.mk PKG_NAME:= libnl -PKG_VERSION:= 1.1 +PKG_VERSION:= 2.0 PKG_RELEASE:= 1 -PKG_MD5SUM:= ae970ccd9144e132b68664f98e7ceeb1 +PKG_MD5SUM:= 6aaf1e9802a17a7d702bb0638044ffa7 PKG_DESCR:= Netlink library PKG_SECTION:= libs -PKG_SITES:= http://downloads.openwrt.org/sources/ +PKG_URL:= http://www.infradead.org/~tgr/libnl/ +PKG_SITES:= http://www.infradead.org/~tgr/libnl/files/ PKG_SUBPKGS:= LIBNL LIBNL_DEV PKGSD_LIBNL_DEV:= header files for netlink library @@ -17,14 +18,10 @@ PKGSC_LIBNL_DEV:= devel include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,LIBNL,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -$(eval $(call PKG_template,LIBNL_DEV,${PKG_NAME}-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBNL_DEV},${PKGSC_LIBNL_DEV})) +$(eval $(call PKG_template,LIBNL,libnl,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +$(eval $(call PKG_template,LIBNL_DEV,libnl-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBNL_DEV},${PKGSC_LIBNL_DEV})) -SUB_INSTALLS-y:= -SUB_INSTALLS-m:= -SUB_INSTALLS-${ADK_PACKAGE_LIBNL_DEV}+= libnl-dev-install - -post-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y} +libnl-install: ${INSTALL_DIR} ${IDIR_LIBNL}/usr/lib ${CP} ${WRKINST}/usr/lib/libnl.so* ${IDIR_LIBNL}/usr/lib diff --git a/package/libnl/patches/patch-include_netlink-local_h b/package/libnl/patches/patch-include_netlink-local_h deleted file mode 100644 index 02dc66130..000000000 --- a/package/libnl/patches/patch-include_netlink-local_h +++ /dev/null @@ -1,20 +0,0 @@ -$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ ---- libnl-1.1.orig/include/netlink-local.h 2008-01-14 16:48:45.000000000 +0100 -+++ libnl-1.1/include/netlink-local.h 2009-05-29 00:17:59.000000000 +0200 -@@ -26,6 +26,7 @@ - #include <sys/socket.h> - #include <inttypes.h> - #include <assert.h> -+#include <limits.h> - - #include <arpa/inet.h> - #include <netdb.h> -@@ -337,7 +337,7 @@ static inline int nl_cb_call(struct nl_c - } - - #define ARRAY_SIZE(X) (sizeof(X) / sizeof((X)[0])) --#define offsetof(TYPE, MEMBER) ((size_t) &((TYPE *)0)->MEMBER) -+#define __offsetof(TYPE, MEMBER) ((size_t) &((TYPE *)0)->MEMBER) - - #define __init __attribute__ ((constructor)) - #define __exit __attribute__ ((destructor)) diff --git a/package/libnl/patches/patch-include_netlink-types_h b/package/libnl/patches/patch-include_netlink-types_h deleted file mode 100644 index 01d181e28..000000000 --- a/package/libnl/patches/patch-include_netlink-types_h +++ /dev/null @@ -1,19 +0,0 @@ -$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ ---- libnl-1.1.orig/include/netlink-types.h 2008-01-14 16:48:45.000000000 +0100 -+++ libnl-1.1/include/netlink-types.h 2009-04-16 20:16:45.349364825 +0200 -@@ -95,15 +95,6 @@ struct nl_cache_mngr - - struct nl_parser_param; - --struct genl_info --{ -- struct sockaddr_nl * who; -- struct nlmsghdr * nlh; -- struct genlmsghdr * genlhdr; -- void * userhdr; -- struct nlattr ** attrs; --}; -- - #define LOOSE_FLAG_COMPARISON 1 - - #define NL_OBJ_MARK 1 diff --git a/package/libnl/patches/patch-include_netlink_genl_mngt_h b/package/libnl/patches/patch-include_netlink_genl_mngt_h deleted file mode 100644 index 28ba36d23..000000000 --- a/package/libnl/patches/patch-include_netlink_genl_mngt_h +++ /dev/null @@ -1,19 +0,0 @@ -$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ ---- libnl-1.1.orig/include/netlink/genl/mngt.h 2008-01-14 16:48:45.000000000 +0100 -+++ libnl-1.1/include/netlink/genl/mngt.h 2009-04-16 20:16:45.343843731 +0200 -@@ -22,6 +22,15 @@ extern "C" { - - struct nl_cache_ops; - -+struct genl_info -+{ -+ struct sockaddr_nl * who; -+ struct nlmsghdr * nlh; -+ struct genlmsghdr * genlhdr; -+ void * userhdr; -+ struct nlattr ** attrs; -+}; -+ - /** - * @ingroup genl_mngt - * Generic Netlink Command diff --git a/package/libnl/patches/patch-lib_object_c b/package/libnl/patches/patch-lib_object_c deleted file mode 100644 index 6d4ba6c8c..000000000 --- a/package/libnl/patches/patch-lib_object_c +++ /dev/null @@ -1,12 +0,0 @@ -$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ ---- libnl-1.1.orig/lib/object.c 2008-01-14 16:48:45.000000000 +0100 -+++ libnl-1.1/lib/object.c 2009-05-28 23:20:00.925639994 +0200 -@@ -96,7 +96,7 @@ struct nl_object *nl_object_clone(struct - { - struct nl_object *new; - struct nl_object_ops *ops = obj_ops(obj); -- int doff = offsetof(struct nl_derived_object, data); -+ int doff = __offsetof(struct nl_derived_object, data); - int size; - - new = nl_object_alloc(ops); diff --git a/package/libnl/patches/patch-src_nl-list-caches_c b/package/libnl/patches/patch-src_nl-list-caches_c deleted file mode 100644 index cb7c8986c..000000000 --- a/package/libnl/patches/patch-src_nl-list-caches_c +++ /dev/null @@ -1,11 +0,0 @@ -$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ ---- libnl-1.1.orig/src/nl-list-caches.c 2008-01-14 16:48:45.000000000 +0100 -+++ libnl-1.1/src/nl-list-caches.c 2009-04-16 20:16:45.349364825 +0200 -@@ -10,6 +10,7 @@ - */ - - #include "utils.h" -+#include <netlink-local.h> - - static void print_usage(void) - { diff --git a/package/libnl/patches/patch-src_utils_c b/package/libnl/patches/patch-src_utils_c deleted file mode 100644 index 05da529a3..000000000 --- a/package/libnl/patches/patch-src_utils_c +++ /dev/null @@ -1,11 +0,0 @@ -$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ ---- libnl-1.1.orig/src/utils.c 2008-01-14 16:48:45.000000000 +0100 -+++ libnl-1.1/src/utils.c 2009-04-16 20:16:45.349364825 +0200 -@@ -12,6 +12,7 @@ - #include "utils.h" - - #include <stdlib.h> -+#include <stdarg.h> - - int nltool_init(int argc, char *argv[]) - { diff --git a/package/libnl/patches/patch-src_utils_h b/package/libnl/patches/patch-src_utils_h deleted file mode 100644 index e19e1e182..000000000 --- a/package/libnl/patches/patch-src_utils_h +++ /dev/null @@ -1,11 +0,0 @@ -$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ ---- libnl-1.1.orig/src/utils.h 2008-01-14 16:48:45.000000000 +0100 -+++ libnl-1.1/src/utils.h 2009-04-16 20:16:45.353364776 +0200 -@@ -22,7 +22,6 @@ - #include <sys/types.h> - #include <sys/socket.h> - --#include <netlink-local.h> - #include <netlink/netlink.h> - #include <netlink/utils.h> - #include <netlink/addr.h> diff --git a/package/libogg/Makefile b/package/libogg/Makefile index a672bbe3a..f9d5e5fe9 100644 --- a/package/libogg/Makefile +++ b/package/libogg/Makefile @@ -21,11 +21,7 @@ include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,LIBOGG,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) $(eval $(call PKG_template,LIBOGG_DEV,libogg-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBOGG_DEV},${PKGSC_LIBOGG_DEV})) -SUB_INSTALLS-y:= -SUB_INSTALLS-m:= -SUB_INSTALLS-${ADK_PACKAGE_LIBOGG_DEV}+= libogg-dev-install - -post-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y} +post-install: ${INSTALL_DIR} ${IDIR_LIBOGG}/usr/lib ${CP} ${WRKINST}/usr/lib/libogg.so* ${IDIR_LIBOGG}/usr/lib/ diff --git a/package/libp11/Makefile b/package/libp11/Makefile index 9ba2fec39..8c3536e0e 100644 --- a/package/libp11/Makefile +++ b/package/libp11/Makefile @@ -23,11 +23,7 @@ include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,LIBP11,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) $(eval $(call PKG_template,LIBP11_DEV,libp11-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBP11_DEV},${PKGSC_LIBP11_DEV})) -SUB_INSTALLS-y:= -SUB_INSTALLS-m:= -SUB_INSTALLS-${ADK_PACKAGE_LIBP11_DEV}+= libp11-dev-install - -post-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y} +post-install: ${INSTALL_DIR} ${IDIR_LIBP11}/usr/lib ${CP} ${WRKINST}/usr/lib/libp11.so* ${IDIR_LIBP11}/usr/lib diff --git a/package/libpcap/Makefile b/package/libpcap/Makefile index ebc7701ce..4bb8253d7 100644 --- a/package/libpcap/Makefile +++ b/package/libpcap/Makefile @@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:= libpcap PKG_VERSION:= 1.1.1 -PKG_RELEASE:= 2 +PKG_RELEASE:= 3 PKG_MD5SUM:= 1bca27d206970badae248cfa471bbb47 PKG_DESCR:= a low-level packet capture library PKG_SECTION:= libs diff --git a/package/libpcap/patches/patch-pcap-config_in b/package/libpcap/patches/patch-pcap-config_in new file mode 100644 index 000000000..b50f6fb48 --- /dev/null +++ b/package/libpcap/patches/patch-pcap-config_in @@ -0,0 +1,27 @@ +--- libpcap-1.1.1.orig/pcap-config.in 2010-03-12 02:56:54.000000000 +0100 ++++ libpcap-1.1.1/pcap-config.in 2011-01-06 21:29:12.000000000 +0100 +@@ -29,16 +29,6 @@ do + esac + shift + done +-if [ "@V_RPATH_OPT@" != "" ] +-then +- # +- # If libdir isn't /usr/lib, add it to the run-time linker path. +- # +- if [ "@libdir@" != "/usr/lib" ] +- then +- RPATH=@V_RPATH_OPT@@libdir@ +- fi +-fi + if [ "$static" = 1 ] + then + # +@@ -77,6 +67,6 @@ else + echo "-I@includedir@" + elif [ "$show_libs" = 1 ] + then +- echo "-L@libdir@ $RPATH -lpcap" ++ echo "-L@libdir@ -lpcap" + fi + fi diff --git a/package/libpng/Makefile b/package/libpng/Makefile index 83408d1d3..92365bf63 100644 --- a/package/libpng/Makefile +++ b/package/libpng/Makefile @@ -27,11 +27,7 @@ include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,LIBPNG,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) $(eval $(call PKG_template,LIBPNG_DEV,libpng-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBPNG_DEV},${PKGSC_LIBPNG_DEV},${PKG_OPTS})) -SUB_INSTALLS-y:= -SUB_INSTALLS-m:= -SUB_INSTALLS-${ADK_PACKAGE_LIBPNG_DEV}+= libpng-dev-install - -post-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y} +post-install: ${INSTALL_DIR} ${IDIR_LIBPNG}/usr/lib ${CP} ${WRKINST}/usr/lib/libpng{,12}.so* ${IDIR_LIBPNG}/usr/lib/ diff --git a/package/libtiff/Makefile b/package/libtiff/Makefile index ebd9988bf..27060c07f 100644 --- a/package/libtiff/Makefile +++ b/package/libtiff/Makefile @@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= libtiff PKG_VERSION:= 3.9.4 -PKG_RELEASE:= 2 +PKG_RELEASE:= 3 PKG_MD5SUM:= 2006c1bdd12644dbf02956955175afd6 PKG_DESCR:= A library for reading/writing TIFF images PKG_SECTION:= libs @@ -28,13 +28,9 @@ include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,LIBTIFF,libtiff,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) $(eval $(call PKG_template,LIBTIFF_DEV,libtiff-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBTIFF_DEV},${PKGSC_LIBTIFF_DEV},${PKG_OPTS})) -SUB_INSTALLS-y:= -SUB_INSTALLS-m:= -SUB_INSTALLS-${ADK_PACKAGE_LIBTIFF_DEV}+= libtiff-dev-install +CONFIGURE_ARGS+= --disable-cxx --disable-rpath -CONFIGURE_ARGS+= --disable-cxx - -post-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y} +post-install: ${INSTALL_DIR} ${IDIR_LIBTIFF}/usr/lib ${CP} ${WRKINST}/usr/lib/libtiff.so* ${IDIR_LIBTIFF}/usr/lib/ diff --git a/package/libtiff/patches/patch-Makefile_in b/package/libtiff/patches/patch-Makefile_in new file mode 100644 index 000000000..529d1cb47 --- /dev/null +++ b/package/libtiff/patches/patch-Makefile_in @@ -0,0 +1,11 @@ +--- tiff-3.9.4.orig/Makefile.in 2010-06-15 20:58:54.000000000 +0200 ++++ tiff-3.9.4/Makefile.in 2011-01-08 11:52:47.000000000 +0100 +@@ -330,7 +330,7 @@ EXTRA_DIST = \ + nmake.opt + + dist_doc_DATA = $(docfiles) +-SUBDIRS = port libtiff tools build contrib test man html ++SUBDIRS = port libtiff build man + all: all-recursive + + .SUFFIXES: diff --git a/package/libtool/Makefile b/package/libtool/Makefile index e22290dcf..bfc3695eb 100644 --- a/package/libtool/Makefile +++ b/package/libtool/Makefile @@ -29,12 +29,7 @@ endif CONFIGURE_ARGS+= --enable-ltdl-install -SUB_INSTALLS-y:= -SUB_INSTALLS-m:= -SUB_INSTALLS-${ADK_PACKAGE_LIBLTDL}+= libltdl-install -SUB_INSTALLS-${ADK_PACKAGE_LIBLTDL_DEV}+= libltdl-dev-install - -post-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y} +post-install: ${INSTALL_DIR} ${IDIR_LIBTOOL}/usr/bin ${INSTALL_BIN} ${WRKINST}/usr/bin/libtool ${IDIR_LIBTOOL}/usr/bin ${INSTALL_BIN} ${WRKINST}/usr/bin/libtoolize ${IDIR_LIBTOOL}/usr/bin diff --git a/package/libusb-compat/Makefile b/package/libusb-compat/Makefile index d7f46c858..728f5b5d1 100644 --- a/package/libusb-compat/Makefile +++ b/package/libusb-compat/Makefile @@ -28,11 +28,7 @@ include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,LIBUSB_COMPAT,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) $(eval $(call PKG_template,LIBUSB_COMPAT_DEV,${PKG_NAME}-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBUSB_COMPAT_DEV},${PKGSC_LIBUSB_COMPAT_DEV},${PKG_OPTS})) -SUB_INSTALLS-y:= -SUB_INSTALLS-m:= -SUB_INSTALLS-${ADK_PACKAGE_LIBUSB_COMPAT_DEV}+= libusb-compat-dev-install - -post-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y} +post-install: ${INSTALL_DIR} ${IDIR_LIBUSB_COMPAT}/usr/lib ${CP} ${WRKINST}/usr/lib/libusb*.so* ${IDIR_LIBUSB_COMPAT}/usr/lib/ diff --git a/package/libusb/Makefile b/package/libusb/Makefile index 4358bc720..189329275 100644 --- a/package/libusb/Makefile +++ b/package/libusb/Makefile @@ -27,11 +27,7 @@ include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,LIBUSB,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) $(eval $(call PKG_template,LIBUSB_DEV,${PKG_NAME}-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBUSB_DEV},${PKGSC_LIBUSB_DEV},${PKG_OPTS})) -SUB_INSTALLS-y:= -SUB_INSTALLS-m:= -SUB_INSTALLS-${ADK_PACKAGE_LIBUSB_DEV}+= libusb-dev-install - -post-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y} +post-install: ${INSTALL_DIR} ${IDIR_LIBUSB}/usr/lib ${CP} ${WRKINST}/usr/lib/libusb*.so* ${IDIR_LIBUSB}/usr/lib/ diff --git a/package/libvorbis/Makefile b/package/libvorbis/Makefile index 484ffa867..a980c64a7 100644 --- a/package/libvorbis/Makefile +++ b/package/libvorbis/Makefile @@ -23,19 +23,17 @@ $(eval $(call PKG_template,LIBVORBIS,libvorbis,${PKG_VERSION}-${PKG_RELEASE},${P $(eval $(call PKG_template,LIBVORBISENC,libvorbisenc,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) $(eval $(call PKG_template,LIBVORBIS_DEV,libvorbis-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBVORBIS_DEV},${PKGSC_LIBVORBIS_DEV})) -SUB_INSTALLS-y:= -SUB_INSTALLS-m:= -SUB_INSTALLS-${ADK_PACKAGE_LIBVORBIS_DEV}+= libvorbis-dev-install - CONFIGURE_ENV+= LIBS="-lm -logg" CONFIGURE_ARGS+= --with-ogg="${STAGING_TARGET_DIR}/usr" \ --with-ogg-includes="${STAGING_TARGET_DIR}/usr/include" \ --with-ogg-libraries="${STAGING_TARGET_DIR}/usr/lib" -post-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y} +post-install: ${INSTALL_DIR} ${IDIR_LIBVORBIS}/usr/lib ${CP} ${WRKINST}/usr/lib/libvorbis.so* ${IDIR_LIBVORBIS}/usr/lib/ ${CP} ${WRKINST}/usr/lib/libvorbisfile.so* ${IDIR_LIBVORBIS}/usr/lib/ + +libvorbisenc-install: ${INSTALL_DIR} ${IDIR_LIBVORBISENC}/usr/lib ${CP} ${WRKINST}/usr/lib/libvorbisenc.so* ${IDIR_LIBVORBISENC}/usr/lib/ diff --git a/package/lvm/patches/patch-Makefile_in b/package/lvm/patches/patch-Makefile_in new file mode 100644 index 000000000..22b0626e5 --- /dev/null +++ b/package/lvm/patches/patch-Makefile_in @@ -0,0 +1,20 @@ +--- LVM2.2.02.79.orig/Makefile.in 2010-11-22 22:39:47.000000000 +0100 ++++ LVM2.2.02.79/Makefile.in 2011-01-07 20:54:18.000000000 +0100 +@@ -16,7 +16,7 @@ srcdir = @srcdir@ + top_srcdir = @top_srcdir@ + top_builddir = @top_builddir@ + +-SUBDIRS = doc include man scripts ++SUBDIRS = include man scripts + + ifeq ("@UDEV_RULES@", "yes") + SUBDIRS += udev +@@ -33,7 +33,7 @@ ifeq ("@APPLIB@", "yes") + endif + + ifeq ($(MAKECMDGOALS),distclean) +- SUBDIRS = doc include man scripts \ ++ SUBDIRS = include man scripts \ + lib tools daemons libdm \ + udev po liblvm test/api test + endif diff --git a/package/mplayer/Makefile b/package/mplayer/Makefile index bad5c656d..6b4521cf5 100644 --- a/package/mplayer/Makefile +++ b/package/mplayer/Makefile @@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= mplayer PKG_VERSION:= 1.0-32749 -PKG_RELEASE:= 1 +PKG_RELEASE:= 2 PKG_MD5SUM:= aadc5d8cca503c8b18b3ed00b3a52cf5 PKG_DESCR:= popular video player PKG_SECTION:= multimedia @@ -127,7 +127,7 @@ CONFIGURE_ARGS:= --prefix=/usr \ --disable-xinerama \ --disable-vidix \ --disable-gl \ - --extra-cflags="${TCFLAGS} ${EXTRA_CFLAGS}" \ + --extra-cflags="${EXTRA_CFLAGS}" \ ${CONFIGURE_CPU_OPTS} \ ${CONFIGURE_DEBUG} \ ${CONFIGURE_DIRECTFB} diff --git a/package/mplayer/patches/patch-configure b/package/mplayer/patches/patch-configure new file mode 100644 index 000000000..eb33a8720 --- /dev/null +++ b/package/mplayer/patches/patch-configure @@ -0,0 +1,11 @@ +--- mplayer-1.0-32749.orig/configure 2011-01-03 11:27:11.000000000 +0100 ++++ mplayer-1.0-32749/configure 2011-01-09 00:35:20.000000000 +0100 +@@ -2554,7 +2554,7 @@ else + fi + + cflag_check -mno-omit-leaf-frame-pointer && cflags_no_omit_leaf_frame_pointer="-mno-omit-leaf-frame-pointer" +-cflag_check -MD -MP && DEPFLAGS="-MD -MP $CFLAGS" ++cflag_check -MD -MP && DEPFLAGS="-MD -MP" + + + if test -n "$LDFLAGS" ; then diff --git a/package/ncurses/Makefile b/package/ncurses/Makefile index 60bab59af..4d7b60035 100644 --- a/package/ncurses/Makefile +++ b/package/ncurses/Makefile @@ -24,10 +24,6 @@ include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,LIBNCURSES,libncurses,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) $(eval $(call PKG_template,LIBNCURSES_DEV,libncurses-dev,${PKG_VERSION}-${PKG_RELEASE},libncurses,${PKGSD_LIBNCURSES_DEV},${PKGSC_LIBNCURSES_DEV})) -SUB_INSTALLS-y:= -SUB_INSTALLS-m:= -SUB_INSTALLS-${ADK_PACKAGE_LIBNCURSES_DEV}+= libncurses-dev-install - CONFIGURE_ENV+= ac_cv_linux_vers=2 CONFIGURE_ARGS+= --without-cxx \ --without-cxx-binding \ @@ -67,7 +63,7 @@ pre-configure: find ${WRKBUILD} -name *.o -exec rm {} \; find ${WRKBUILD} -name *.a -exec rm {} \; -post-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y} +post-install: # this is installed as libncurses - make libcurses a "link" rm -f ${WRKINST}/usr/lib/libcurses.so* echo 'GROUP(-lncurses)' >${WRKINST}/usr/lib/libcurses.so diff --git a/package/openct/Makefile b/package/openct/Makefile index 1164c4a13..b2e5e8a79 100644 --- a/package/openct/Makefile +++ b/package/openct/Makefile @@ -27,11 +27,7 @@ $(eval $(call PKG_template,OPENCT,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PK $(eval $(call PKG_template,LIBOPENCT,libopenct,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_LIBOPENCT},${PKGSD_LIBOPENCT},${PKGSC_LIBOPENCT})) $(eval $(call PKG_template,LIBOPENCT_DEV,libopenct-dev,${PKG_VERSION}-${PKG_RELEASE},,${PKGSD_LIBOPENCT_DEV},${PKGSC_LIBOPENCT_DEV})) -SUB_INSTALLS-y:= -SUB_INSTALLS-m:= -SUB_INSTALLS-${ADK_PACKAGE_LIBOPENCT_DEV}+= libopenct-dev-install - -post-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y} +post-install: ${INSTALL_DIR} ${IDIR_OPENCT}/etc ${IDIR_OPENCT}/usr/{sbin,bin} ${INSTALL_BIN} ${WRKINST}/usr/sbin/openct-control \ ${IDIR_OPENCT}/usr/sbin diff --git a/package/opensc/Makefile b/package/opensc/Makefile index 96c3e4138..88a85939e 100644 --- a/package/opensc/Makefile +++ b/package/opensc/Makefile @@ -32,14 +32,10 @@ CONFIGURE_ARGS+= --disable-man \ --enable-pcsc \ --enable-openct -SUB_INSTALLS-y:= -SUB_INSTALLS-m:= -SUB_INSTALLS-${ADK_PACKAGE_LIBOPENSC_DEV}+= libopensc-dev-install - post-extract: cd ${WRKBUILD} && autoreconf -vif -post-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y} +post-install: ${INSTALL_DIR} ${IDIR_OPENSC}/usr/bin ${INSTALL_DIR} ${IDIR_OPENSC}/usr/share/opensc ${INSTALL_DATA} ${WRKINST}/usr/share/opensc/* \ diff --git a/package/opensc/patches/patch-ltmain_sh b/package/opensc/patches/patch-ltmain_sh new file mode 100644 index 000000000..e36389c67 --- /dev/null +++ b/package/opensc/patches/patch-ltmain_sh @@ -0,0 +1,30 @@ +--- opensc-0.11.13.orig/ltmain.sh 2011-01-09 00:58:43.000000000 +0100 ++++ opensc-0.11.13/ltmain.sh 2011-01-09 00:57:54.000000000 +0100 +@@ -6635,27 +6635,6 @@ func_mode_link () + esac + fi + +- # Hardcode the library path. +- # Skip directories that are in the system default run-time +- # search path. +- case " $sys_lib_dlsearch_path " in +- *" $absdir "*) ;; +- *) +- case "$compile_rpath " in +- *" $absdir "*) ;; +- *) func_append compile_rpath " $absdir" ;; +- esac +- ;; +- esac +- case " $sys_lib_dlsearch_path " in +- *" $libdir "*) ;; +- *) +- case "$finalize_rpath " in +- *" $libdir "*) ;; +- *) func_append finalize_rpath " $libdir" ;; +- esac +- ;; +- esac + fi # $linkmode,$pass = prog,link... + + if test "$alldeplibs" = yes && diff --git a/package/opensc/patches/patch-src_Makefile_in b/package/opensc/patches/patch-src_Makefile_in index 63d41a20e..f2891678f 100644 --- a/package/opensc/patches/patch-src_Makefile_in +++ b/package/opensc/patches/patch-src_Makefile_in @@ -1,6 +1,6 @@ ---- opensc-0.11.13.orig/src/Makefile.in 2010-02-16 10:32:17.000000000 +0100 -+++ opensc-0.11.13/src/Makefile.in 2010-12-15 21:48:57.000000000 +0100 -@@ -260,8 +260,8 @@ MAINTAINERCLEANFILES = $(srcdir)/Makefil +--- opensc-0.11.13.orig/src/Makefile.in 2011-01-09 00:58:50.000000000 +0100 ++++ opensc-0.11.13/src/Makefile.in 2011-01-09 00:56:00.000000000 +0100 +@@ -263,8 +263,8 @@ MAINTAINERCLEANFILES = $(srcdir)/Makefil EXTRA_DIST = Makefile.mak # Order IS important diff --git a/package/openssh/Makefile b/package/openssh/Makefile index 10b4523bc..787d59954 100644 --- a/package/openssh/Makefile +++ b/package/openssh/Makefile @@ -56,6 +56,7 @@ CONFIGURE_ARGS+= --disable-strip \ --disable-wtmp \ --disable-wtmpx \ --without-bsd-auth \ + --without-rpath \ --without-pam \ --without-x \ --without-zlib-version-check \ diff --git a/package/openssl/Makefile b/package/openssl/Makefile index f0fdc50fb..0d30b8f63 100644 --- a/package/openssl/Makefile +++ b/package/openssl/Makefile @@ -32,10 +32,6 @@ $(eval $(call PKG_template,LIBOPENSSL,libopenssl,${PKG_VERSION}-${PKG_RELEASE},$ $(eval $(call PKG_template,LIBOPENSSL_DEV,libopenssl-dev,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_LIBOPENSSL_DEV},${PKGSD_LIBOPENSSL_DEV},${PKGSC_LIBOPENSSL_DEV})) $(eval $(call PKG_template,OPENSSL_UTIL,openssl-util,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_OPENSSL_UTIL},${PKGSD_OPENSSL_UTIL},${PKGSC_OPENSSL_UTIL})) -SUB_INSTALLS-y:= -SUB_INSTALLS-m:= -SUB_INSTALLS-${ADK_PACKAGE_LIBOPENSSL_DEV}+= libopenssl-dev-install - CONFIG_STYLE:= manual BUILD_STYLE:= manual @@ -74,10 +70,12 @@ do-build: OPTIMIZATION_FLAGS="$(TARGET_CFLAGS) -fPIC" \ all build-shared -post-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y} +post-install: ${INSTALL_DIR} ${IDIR_LIBOPENSSL}/usr/lib ${CP} ${WRKINST}/usr/lib/lib*.so* ${IDIR_LIBOPENSSL}/usr/lib chmod 644 ${IDIR_LIBOPENSSL}/usr/lib/lib*.so* + +openssl-util-install: ${INSTALL_DIR} ${IDIR_OPENSSL_UTIL}/usr/bin ${CP} ${WRKINST}/usr/bin/openssl ${IDIR_OPENSSL_UTIL}/usr/bin ${INSTALL_DIR} ${IDIR_OPENSSL_UTIL}/etc/ssl/{,certs,private} diff --git a/package/openvpn/Makefile b/package/openvpn/Makefile index 774a63ea9..f2ecc8823 100644 --- a/package/openvpn/Makefile +++ b/package/openvpn/Makefile @@ -60,11 +60,7 @@ CONFIGURE_ARGS+= --disable-pthread \ --without-ifconfig-path \ --without-route-path -SUB_INSTALLS-y:= -SUB_INSTALLS-m:= -SUB_INSTALLS-${OPENVPN_EASY_RSA}+= openvpn-easy-rsa-install - -post-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y} +post-install: ${INSTALL_DIR} $(IDIR_OPENVPN)/usr/sbin $(IDIR_OPENVPN)/etc/openvpn ${INSTALL_BIN} $(WRKINST)/usr/sbin/openvpn $(IDIR_OPENVPN)/usr/sbin/ $(CP) ./files/openvpn.conf $(IDIR_OPENVPN)/etc/openvpn/ diff --git a/package/pcsc-lite/Makefile b/package/pcsc-lite/Makefile index ca95456cc..096625b96 100644 --- a/package/pcsc-lite/Makefile +++ b/package/pcsc-lite/Makefile @@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:= pcsc-lite PKG_VERSION:= 1.6.6 -PKG_RELEASE:= 1 +PKG_RELEASE:= 2 PKG_MD5SUM:= f80d3ecd9569b71d557f283f16295c74 PKG_DESCR:= middleware for smartcards PKG_SECTION:= crypto @@ -27,11 +27,7 @@ $(eval $(call PKG_template,PCSC_LITE_DEV,$(PKG_NAME)-dev,$(PKG_VERSION)-${PKG_RE CONFIGURE_ARGS+= --disable-libhal -SUB_INSTALLS-y:= -SUB_INSTALLS-m:= -SUB_INSTALLS-${ADK_PACKAGE_PCSC_LITE_DEV}+= pcsc-lite-dev-install - -post-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y} +post-install: $(INSTALL_DIR) $(IDIR_PCSC_LITE)/etc/reader.conf.d $(INSTALL_DIR) $(IDIR_PCSC_LITE)/usr/sbin $(INSTALL_DIR) $(IDIR_PCSC_LITE)/usr/lib diff --git a/package/pcsc-lite/patches/patch-src_Makefile_in b/package/pcsc-lite/patches/patch-src_Makefile_in new file mode 100644 index 000000000..582fe0bb5 --- /dev/null +++ b/package/pcsc-lite/patches/patch-src_Makefile_in @@ -0,0 +1,20 @@ +--- pcsc-lite-1.6.6.orig/src/Makefile.in 2010-12-12 11:08:27.000000000 +0100 ++++ pcsc-lite-1.6.6/src/Makefile.in 2011-01-07 19:27:46.000000000 +0100 +@@ -338,7 +338,7 @@ libpcsclite_la_SOURCES = \ + winscard_msg.c + + libpcsclite_la_LDFLAGS = -version-info 1:0:0 +-libpcsclite_la_CFLAGS = $(CFLAGS) $(PTHREAD_CFLAGS) -DLIBPCSCLITE -DSIMCLIST_NO_DUMPRESTORE ++libpcsclite_la_CFLAGS = $(PTHREAD_CFLAGS) -DLIBPCSCLITE -DSIMCLIST_NO_DUMPRESTORE + libpcsclite_la_LIBADD = $(PTHREAD_CFLAGS) $(PTHREAD_LIBS) + pcscd_SOURCES = \ + atrhandler.c \ +@@ -390,7 +390,7 @@ pcscd_SOURCES = \ + winscard_svc.c \ + winscard_svc.h + +-pcscd_CFLAGS = $(CFLAGS) $(PTHREAD_CFLAGS) $(LIBUSB_CFLAGS) $(LIBHAL_CFLAGS) \ ++pcscd_CFLAGS = $(PTHREAD_CFLAGS) $(LIBUSB_CFLAGS) $(LIBHAL_CFLAGS) \ + -DPCSCD -DSIMCLIST_NO_DUMPRESTORE + + pcscd_LDFLAGS = $(LDFLAGS) -export-dynamic diff --git a/package/ppp/Makefile b/package/ppp/Makefile index 2c71a603f..ec0e5782e 100644 --- a/package/ppp/Makefile +++ b/package/ppp/Makefile @@ -37,17 +37,7 @@ XAKE_FLAGS+= CC="${TARGET_CC}" \ DESTDIR="${WRKINST}/usr" \ TARGET_AR='${TARGET_CROSS}ar' -SUB_INSTALLS-y:= -SUB_INSTALLS-m:= -SUB_INSTALLS-${ADK_PACKAGE_PPP_MOD_PPPOE}+= mod-pppoe-install -SUB_INSTALLS-${ADK_PACKAGE_PPP_MOD_PPPOA}+= mod-pppoa-install -SUB_INSTALLS-${ADK_PACKAGE_PPP_MOD_RADIUS}+= mod-radius-install -SUB_INSTALLS-${ADK_PACKAGE_PPP_MOD_CHAT}+= mod-chat-install -SUB_INSTALLS-${ADK_PACKAGE_PPP_MOD_PPPDUMP}+= mod-pppdump-install -SUB_INSTALLS-${ADK_PACKAGE_PPP_MOD_PPPSTATS}+= mod-pppstats-install -SUB_INSTALLS-${ADK_PACKAGE_PPP_MOD_PPPUMTS}+= mod-pppumts-install - -post-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y} +post-install: ${INSTALL_DIR} ${IDIR_PPP}/etc/ppp install -m0600 ./files/etc/ppp/chap-secrets ${IDIR_PPP}/etc/ppp/ ${INSTALL_DATA} ./files/etc/ppp/options ${IDIR_PPP}/etc/ppp/ diff --git a/package/procmail/src/Makefile.new b/package/procmail/src/Makefile.new index 38b092ce9..8ec246b2b 100644 --- a/package/procmail/src/Makefile.new +++ b/package/procmail/src/Makefile.new @@ -6,8 +6,8 @@ PM_OBJ=cstdio.o common.o exopen.o goodies.o locking.o \ FM_OBJ=common.o fields.o formisc.o sublib.o ecommon.o \ acommon.o -LDFLAGS = -lm -ldl -lc -CFLAGS = -Os -DPROCMAIL +LDFLAGS ?= -lm -ldl -lc +CFLAGS ?= -DPROCMAIL all: procmail formail diff --git a/package/rpcbind/Makefile b/package/rpcbind/Makefile index cd03c4209..a175dbfdf 100644 --- a/package/rpcbind/Makefile +++ b/package/rpcbind/Makefile @@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:= rpcbind PKG_VERSION:= 0.2.0 -PKG_RELEASE:= 1 +PKG_RELEASE:= 2 PKG_MD5SUM:= 1a77ddb1aaea8099ab19c351eeb26316 PKG_DESCR:= converts RPC program numbers into universal addresses PKG_SECTION:= net/misc diff --git a/package/rpcbind/files/rpcbind.init b/package/rpcbind/files/rpcbind.init index de794f72e..439149af4 100644 --- a/package/rpcbind/files/rpcbind.init +++ b/package/rpcbind/files/rpcbind.init @@ -11,10 +11,10 @@ autostart) exec sh $0 start ;; start) - /usr/sbin/rpcbind + /usr/bin/rpcbind ;; stop) - kill $(pgrep -f /usr/sbin/rpcbind) + kill $(pgrep -f /usr/bin/rpcbind) ;; restart) sh $0 stop diff --git a/package/rpcbind/patches/patch-ltmain_sh b/package/rpcbind/patches/patch-ltmain_sh new file mode 100644 index 000000000..1f5fa84b7 --- /dev/null +++ b/package/rpcbind/patches/patch-ltmain_sh @@ -0,0 +1,30 @@ +--- rpcbind-0.2.0.orig/ltmain.sh 2008-08-30 00:27:25.000000000 +0200 ++++ rpcbind-0.2.0/ltmain.sh 2011-01-09 00:48:19.000000000 +0100 +@@ -2561,27 +2561,6 @@ EOF + esac + fi + +- # Hardcode the library path. +- # Skip directories that are in the system default run-time +- # search path. +- case " $sys_lib_dlsearch_path " in +- *" $absdir "*) ;; +- *) +- case "$compile_rpath " in +- *" $absdir "*) ;; +- *) compile_rpath="$compile_rpath $absdir" +- esac +- ;; +- esac +- case " $sys_lib_dlsearch_path " in +- *" $libdir "*) ;; +- *) +- case "$finalize_rpath " in +- *" $libdir "*) ;; +- *) finalize_rpath="$finalize_rpath $libdir" +- esac +- ;; +- esac + fi # $linkmode,$pass = prog,link... + + if test "$alldeplibs" = yes && diff --git a/package/rtorrent/patches/patch-ltmain_sh b/package/rtorrent/patches/patch-ltmain_sh new file mode 100644 index 000000000..9b491ecbb --- /dev/null +++ b/package/rtorrent/patches/patch-ltmain_sh @@ -0,0 +1,30 @@ +--- rtorrent-0.8.5.orig/ltmain.sh 2009-06-18 21:37:48.000000000 +0200 ++++ rtorrent-0.8.5/ltmain.sh 2011-01-09 01:46:11.000000000 +0100 +@@ -5516,27 +5516,6 @@ func_mode_link () + esac + fi + +- # Hardcode the library path. +- # Skip directories that are in the system default run-time +- # search path. +- case " $sys_lib_dlsearch_path " in +- *" $absdir "*) ;; +- *) +- case "$compile_rpath " in +- *" $absdir "*) ;; +- *) compile_rpath="$compile_rpath $absdir" +- esac +- ;; +- esac +- case " $sys_lib_dlsearch_path " in +- *" $libdir "*) ;; +- *) +- case "$finalize_rpath " in +- *" $libdir "*) ;; +- *) finalize_rpath="$finalize_rpath $libdir" +- esac +- ;; +- esac + fi # $linkmode,$pass = prog,link... + + if test "$alldeplibs" = yes && diff --git a/package/rtorrent/patches/patch-src_command_download_cc b/package/rtorrent/patches/patch-src_command_download_cc index 4c1e50a6c..cd5ac7287 100644 --- a/package/rtorrent/patches/patch-src_command_download_cc +++ b/package/rtorrent/patches/patch-src_command_download_cc @@ -1,5 +1,5 @@ ---- rtorrent-0.8.4.orig/src/command_download.cc 2008-11-19 18:01:20.000000000 +0100 -+++ rtorrent-0.8.4/src/command_download.cc 2009-08-28 18:01:37.606461520 +0200 +--- rtorrent-0.8.5.orig/src/command_download.cc 2009-05-14 14:34:42.000000000 +0200 ++++ rtorrent-0.8.5/src/command_download.cc 2011-01-09 01:42:55.000000000 +0100 @@ -36,6 +36,7 @@ #include "config.h" @@ -7,4 +7,4 @@ +#include <cstdio> #include <functional> #include <unistd.h> - #include <rak/file_stat.h> + #include <cstdio> diff --git a/package/rtorrent/patches/patch-src_command_events_cc b/package/rtorrent/patches/patch-src_command_events_cc index dcd522735..db6da4a11 100644 --- a/package/rtorrent/patches/patch-src_command_events_cc +++ b/package/rtorrent/patches/patch-src_command_events_cc @@ -1,10 +1,10 @@ ---- rtorrent-0.8.4.orig/src/command_events.cc 2008-11-11 11:37:20.000000000 +0100 -+++ rtorrent-0.8.4/src/command_events.cc 2009-08-28 18:14:19.096303800 +0200 +--- rtorrent-0.8.5.orig/src/command_events.cc 2009-05-14 14:34:42.000000000 +0200 ++++ rtorrent-0.8.5/src/command_events.cc 2011-01-09 01:42:55.000000000 +0100 @@ -36,6 +36,7 @@ #include "config.h" +#include <cstdio> #include <functional> + #include <cstdio> #include <rak/file_stat.h> - #include <rak/path.h> diff --git a/package/rtorrent/patches/patch-src_command_network_cc b/package/rtorrent/patches/patch-src_command_network_cc index 5d0405ebe..89a44d351 100644 --- a/package/rtorrent/patches/patch-src_command_network_cc +++ b/package/rtorrent/patches/patch-src_command_network_cc @@ -1,11 +1,11 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $ ---- rtorrent-0.8.2.orig/src/command_network.cc 2008-05-07 14:19:11.000000000 +0200 -+++ rtorrent-0.8.2/src/command_network.cc 2009-05-29 01:38:53.000000000 +0200 +--- rtorrent-0.8.5.orig/src/command_network.cc 2009-05-14 14:34:42.000000000 +0200 ++++ rtorrent-0.8.5/src/command_network.cc 2011-01-09 01:42:55.000000000 +0100 @@ -36,6 +36,7 @@ #include "config.h" +#include <cstdio> #include <functional> + #include <cstdio> #include <rak/address_info.h> - #include <rak/path.h> diff --git a/package/rtorrent/patches/patch-src_rpc_parse_cc b/package/rtorrent/patches/patch-src_rpc_parse_cc index 38530b38e..04a4bd67d 100644 --- a/package/rtorrent/patches/patch-src_rpc_parse_cc +++ b/package/rtorrent/patches/patch-src_rpc_parse_cc @@ -1,9 +1,9 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $ ---- rtorrent-0.8.4.orig/src/rpc/parse.cc 2008-08-26 22:14:33.000000000 +0200 -+++ rtorrent-0.8.4/src/rpc/parse.cc 2009-08-28 17:58:13.616282106 +0200 -@@ -38,6 +38,8 @@ - +--- rtorrent-0.8.5.orig/src/rpc/parse.cc 2009-05-14 14:34:42.000000000 +0200 ++++ rtorrent-0.8.5/src/rpc/parse.cc 2011-01-09 01:42:55.000000000 +0100 +@@ -39,6 +39,8 @@ #include <cstring> + #include <cstdio> #include <locale> +#include <cstdio> +#include <cstring> diff --git a/package/rtorrent/patches/patch-src_rpc_scgi_task_cc b/package/rtorrent/patches/patch-src_rpc_scgi_task_cc index f81092202..d282b8139 100644 --- a/package/rtorrent/patches/patch-src_rpc_scgi_task_cc +++ b/package/rtorrent/patches/patch-src_rpc_scgi_task_cc @@ -1,11 +1,11 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $ ---- rtorrent-0.8.2.orig/src/rpc/scgi_task.cc 2008-05-07 14:19:10.000000000 +0200 -+++ rtorrent-0.8.2/src/rpc/scgi_task.cc 2009-05-29 01:29:24.000000000 +0200 +--- rtorrent-0.8.5.orig/src/rpc/scgi_task.cc 2009-05-14 14:34:42.000000000 +0200 ++++ rtorrent-0.8.5/src/rpc/scgi_task.cc 2011-01-09 01:42:55.000000000 +0100 @@ -36,6 +36,7 @@ #include "config.h" +#include <cstdio> #include <rak/error_number.h> + #include <cstdio> #include <sys/types.h> - #include <sys/socket.h> diff --git a/package/rtorrent/patches/patch-src_utils_lockfile_cc b/package/rtorrent/patches/patch-src_utils_lockfile_cc index 58eafdfc8..31b2cd3fc 100644 --- a/package/rtorrent/patches/patch-src_utils_lockfile_cc +++ b/package/rtorrent/patches/patch-src_utils_lockfile_cc @@ -1,11 +1,11 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $ ---- rtorrent-0.8.2.orig/src/utils/lockfile.cc 2008-05-07 14:19:11.000000000 +0200 -+++ rtorrent-0.8.2/src/utils/lockfile.cc 2009-05-29 01:34:05.000000000 +0200 +--- rtorrent-0.8.5.orig/src/utils/lockfile.cc 2009-05-14 14:34:42.000000000 +0200 ++++ rtorrent-0.8.5/src/utils/lockfile.cc 2011-01-09 01:42:55.000000000 +0100 @@ -39,6 +39,7 @@ #include <algorithm> #include <cctype> #include <cerrno> +#include <cstdio> #include <cstring> + #include <cstdio> #include <sstream> - #include <fcntl.h> diff --git a/package/sangam-atm/Makefile b/package/sangam-atm/Makefile index ef1c080a5..bc6563255 100644 --- a/package/sangam-atm/Makefile +++ b/package/sangam-atm/Makefile @@ -22,7 +22,7 @@ BUILD_STYLE:= manual INSTALL_STYLE:= manual do-build: - $(MAKE) ${KERNEL_MAKE_OPTS} LDFLAGS="" SUBDIRS="${WRKBUILD}" modules + ${KERNEL_MAKE_ENV} $(MAKE) ${KERNEL_MAKE_OPTS} LDFLAGS="" SUBDIRS="${WRKBUILD}" modules do-install: ${INSTALL_DIR} ${IDIR_KMOD_SANGAM_ATM}/etc/modules.d/ diff --git a/package/sdl-image/Makefile b/package/sdl-image/Makefile index 37c0b9a98..8d6105e58 100644 --- a/package/sdl-image/Makefile +++ b/package/sdl-image/Makefile @@ -26,16 +26,12 @@ include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,LIBSDL_IMAGE,libsdl-image,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) $(eval $(call PKG_template,LIBSDL_IMAGE_DEV,libsdl-image-dev,$(PKG_VERSION)-${PKG_RELEASE},libsdl-image,${PKGSD_LIBSDL_IMAGE_DEV},${PKGSC_LIBSDL_IMAGE_DEV})) -SUB_INSTALLS-y:= -SUB_INSTALLS-m:= -SUB_INSTALLS-${ADK_PACKAGE_LIBSDL_IMAGE_DEV}+= libsdl-image-dev-install - CONFIGURE_ARGS+= --enable-png \ --enable-jpg \ --enable-bmp \ --enable-tif -post-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y} +post-install: $(INSTALL_DIR) $(IDIR_LIBSDL_IMAGE)/usr/lib $(CP) ${WRKINST}/usr/lib/libSDL*.so* $(IDIR_LIBSDL_IMAGE)/usr/lib diff --git a/package/sdl/Makefile b/package/sdl/Makefile index 9fb10463a..4b390bb6a 100644 --- a/package/sdl/Makefile +++ b/package/sdl/Makefile @@ -26,10 +26,6 @@ include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,LIBSDL,libsdl,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) $(eval $(call PKG_template,LIBSDL_DEV,libsdl-dev,$(PKG_VERSION)-${PKG_RELEASE},libsdl,${PKGSD_LIBSDL_DEV},${PKGSC_LIBSDL_DEV})) -SUB_INSTALLS-y:= -SUB_INSTALLS-m:= -SUB_INSTALLS-${ADK_PACKAGE_LIBSDL_DEV}+= libsdl-dev-install - CONFIGURE_ARGS+= --disable-esd \ --disable-oss \ --enable-alsa \ @@ -39,7 +35,7 @@ CONFIGURE_ARGS+= --disable-esd \ --enable-input-tslib \ --with-x -post-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y} +post-install: $(INSTALL_DIR) $(IDIR_LIBSDL)/usr/lib $(CP) ${WRKINST}/usr/lib/libSDL*.so* $(IDIR_LIBSDL)/usr/lib diff --git a/package/subversion/patches/patch-build_ltmain_sh b/package/subversion/patches/patch-build_ltmain_sh new file mode 100644 index 000000000..b9315f8b3 --- /dev/null +++ b/package/subversion/patches/patch-build_ltmain_sh @@ -0,0 +1,30 @@ +--- subversion-1.6.12.orig/build/ltmain.sh 2010-03-31 20:37:12.000000000 +0200 ++++ subversion-1.6.12/build/ltmain.sh 2011-01-09 01:50:49.000000000 +0100 +@@ -2561,27 +2561,6 @@ EOF + esac + fi + +- # Hardcode the library path. +- # Skip directories that are in the system default run-time +- # search path. +- case " $sys_lib_dlsearch_path " in +- *" $absdir "*) ;; +- *) +- case "$compile_rpath " in +- *" $absdir "*) ;; +- *) compile_rpath="$compile_rpath $absdir" +- esac +- ;; +- esac +- case " $sys_lib_dlsearch_path " in +- *" $libdir "*) ;; +- *) +- case "$finalize_rpath " in +- *" $libdir "*) ;; +- *) finalize_rpath="$finalize_rpath $libdir" +- esac +- ;; +- esac + fi # $linkmode,$pass = prog,link... + + if test "$alldeplibs" = yes && diff --git a/package/uclibc/Makefile b/package/uclibc/Makefile index 5538cdfbd..4c4cb447b 100644 --- a/package/uclibc/Makefile +++ b/package/uclibc/Makefile @@ -23,12 +23,8 @@ CONFIG_STYLE:= manual BUILD_STYLE:= manual INSTALL_STYLE:= manual -SUB_INSTALLS-y:= -SUB_INSTALLS-m:= -SUB_INSTALLS-${ADK_PACKAGE_UCLIBC_DEV}+= uclibc-dev-install - # do nothing, uClibc is already build in toolchain directory -do-install: $(STAGING_TARGET_DIR)/lib/libc.so ${SUB_INSTALLS-m} ${SUB_INSTALLS-y} +do-install: $(STAGING_TARGET_DIR)/lib/libc.so ${INSTALL_DIR} $(IDIR_UCLIBC)/lib $(IDIR_UCLIBC)/etc # create timezone file test -z $(ADK_RUNTIME_TIMEZONE) || \ diff --git a/package/ulogd/Makefile b/package/ulogd/Makefile index e1f4d0dc5..3010e7a92 100644 --- a/package/ulogd/Makefile +++ b/package/ulogd/Makefile @@ -34,13 +34,6 @@ $(eval $(call PKG_template,ULOGD_MOD_PGSQL,ulogd-mod-pgsql,${PKG_VERSION}-${PKG_ $(eval $(call PKG_template,ULOGD_MOD_SQLITE,ulogd-mod-sqlite,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) $(eval $(call PKG_template,ULOGD_MOD_EXTRA,ulogd-mod-extra,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -SUB_INSTALLS-y:= -SUB_INSTALLS-m:= -SUB_INSTALLS-${ADK_PACKAGE_ULOGD_MOD_MYSQL}+= ulogd-mod-mysql-install -SUB_INSTALLS-${ADK_PACKAGE_ULOGD_MOD_PGSQL}+= ulogd-mod-pgsql-install -SUB_INSTALLS-${ADK_PACKAGE_ULOGD_MOD_SQLITE}+= ulogd-mod-sqlite-install -SUB_INSTALLS-${ADK_PACKAGE_ULOGD_MOD_EXTRA}+= ulogd-mod-extra-install - TCFLAGS+= -fPIC ifneq (${ADK_PACKAGE_ULOGD_MOD_MYSQL},) @@ -55,7 +48,7 @@ ifneq (${ADK_PACKAGE_ULOGD_MOD_SQLITE},) CONFIGURE_ARGS+= --with-sqlite3=${STAGING_TARGET_DIR}/usr endif -post-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y} +post-install: ${INSTALL_DIR} ${IDIR_ULOGD}/usr/sbin ${IDIR_ULOGD}/usr/lib/ulogd/ ${INSTALL_BIN} ${WRKINST}/usr/lib/ulogd/ulogd_raw2packet_BASE.so \ ${IDIR_ULOGD}/usr/lib/ulogd/ diff --git a/package/wpa_supplicant/Makefile b/package/wpa_supplicant/Makefile index 7b8be1a0c..3b80d12ab 100644 --- a/package/wpa_supplicant/Makefile +++ b/package/wpa_supplicant/Makefile @@ -4,13 +4,14 @@ include ${TOPDIR}/rules.mk PKG_NAME:= wpa_supplicant -PKG_VERSION:= 0.7.2 +PKG_VERSION:= 0.7.3 PKG_RELEASE:= 1 -PKG_MD5SUM:= 0e2cb7e4c35667351d8b7ec28c783e6a +PKG_MD5SUM:= f516f191384a9a546e3f5145c08addda PKG_DESCR:= WPA Supplicant with support for WPA and WPA2 PKG_SECTION:= wifi PKG_DEPENDS:= libnl PKG_BUILDDEP:= libnl +PKG_URL:= http://hostap.epitest.fi/wpa_supplicant/ PKG_SITES:= http://hostap.epitest.fi/releases/ PKG_DFLT_WPA_SUPPLICANT:= y if ADK_TARGET_SYSTEM_IBM_X40 @@ -38,7 +39,7 @@ MAKE_FLAGS+= CPPFLAGS='${TCPPFLAGS}' \ KERNEL=${LINUX_DIR} do-configure: - ${CP} files/config ${WRKBUILD}/.config + ${CP} ./files/config ${WRKBUILD}/.config ifneq (${ADK_PACKAGE_WPA_SUPPLICANT_WITH_GNUTLS},) ${SED} "s#openssl#gnutls#" ${WRKBUILD}/.config endif diff --git a/package/wpa_supplicant/files/config b/package/wpa_supplicant/files/config index aa0ee6b17..c3e2702cd 100644 --- a/package/wpa_supplicant/files/config +++ b/package/wpa_supplicant/files/config @@ -3,6 +3,7 @@ CONFIG_DRIVER_NL80211=y CONFIG_DRIVER_WEXT=y #CONFIG_IEEE8021X_EAPOL=y CONFIG_CTRL_IFACE=y +CONFIG_LIBNL20=y # default CONFIG_EAP_PSK=y diff --git a/package/zlib/Makefile b/package/zlib/Makefile index 0bf048448..6270eaf37 100644 --- a/package/zlib/Makefile +++ b/package/zlib/Makefile @@ -27,10 +27,6 @@ include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,ZLIB,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) $(eval $(call PKG_template,ZLIB_DEV,${PKG_NAME}-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_ZLIB_DEV},${PKGSC_ZLIB_DEV})) -SUB_INSTALLS-y:= -SUB_INSTALLS-m:= -SUB_INSTALLS-${ADK_PACKAGE_ZLIB_DEV}+= zlib-dev-install - CONFIG_STYLE:= manual CONFIGURE_ENV+= uname=Linux @@ -53,7 +49,7 @@ do-configure: $(CONFIGURE_OPTS) \ ); -post-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y} +post-install: ${INSTALL_DIR} ${IDIR_ZLIB}/usr/lib ${CP} ${WRKBUILD}/libz.so* ${IDIR_ZLIB}/usr/lib |