diff options
| -rw-r--r-- | package/libnfsidmap/Makefile | 6 | ||||
| -rw-r--r-- | package/mpg123/Makefile | 17 | ||||
| -rw-r--r-- | package/mpg123/patches/patch-build_ltmain_sh | 14 | ||||
| -rw-r--r-- | scripts/scan-pkgs.sh | 11 | ||||
| -rw-r--r-- | toolchain/gmp/Makefile | 8 |
5 files changed, 36 insertions, 20 deletions
diff --git a/package/libnfsidmap/Makefile b/package/libnfsidmap/Makefile index dc7482e28..532693116 100644 --- a/package/libnfsidmap/Makefile +++ b/package/libnfsidmap/Makefile @@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:= libnfsidmap PKG_VERSION:= 0.24 -PKG_RELEASE:= 1 +PKG_RELEASE:= 2 PKG_MD5SUM:= d71a1ee9881d5b5814ff3ec41256937d PKG_DESCR:= idmap library for NFSv4 PKG_SECTION:= libs @@ -22,9 +22,11 @@ $(eval $(call PKG_template,LIBNFSIDMAP,${PKG_NAME},$(PKG_VERSION)-${PKG_RELEASE} $(eval $(call PKG_template,LIBNFSIDMAP_DEV,libnfsidmap-dev,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBNFSIDMAP_DEV},${PKGSC_LIBNFSIDMAP_DEV})) libnfsidmap-install: - $(INSTALL_DIR) $(IDIR_LIBNFSIDMAP)/usr/lib + $(INSTALL_DIR) $(IDIR_LIBNFSIDMAP)/usr/lib/libnfsidmap $(CP) $(WRKINST)/usr/lib/libnfsidmap.so* \ $(IDIR_LIBNFSIDMAP)/usr/lib/ + $(CP) $(WRKINST)//usr/lib/libnfsidmap/static.so \ + $(IDIR_LIBNFSIDMAP)/usr/lib/libnfsidmap libnfsidmap-dev-install: $(INSTALL_DIR) $(IDIR_LIBNFSIDMAP_DEV)/usr/include diff --git a/package/mpg123/Makefile b/package/mpg123/Makefile index 5f7960371..ca6ec0539 100644 --- a/package/mpg123/Makefile +++ b/package/mpg123/Makefile @@ -4,12 +4,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:= mpg123 -PKG_VERSION:= 1.12.1 -PKG_RELEASE:= 2 -PKG_MD5SUM:= e7d810a75d22954169f1530a436aca4c +PKG_VERSION:= 1.13.3 +PKG_RELEASE:= 1 +PKG_MD5SUM:= b1f990ce76dcf2fdf9d53ac39fc6bc7e PKG_DESCR:= mp3 console player PKG_SECTION:= multimedia -PKG_DEPENDS:= libpthread alsa-lib libltdl +PKG_DEPENDS:= libpthread alsa-lib PKG_BUILDDEP:= alsa-lib PKG_URL:= http://www.mpg123.de/ PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=mpg123/} @@ -20,12 +20,11 @@ include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,MPG123,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +CONFIGURE_ARGS+= --disable-shared \ + --with-default-audio=alsa + post-install: - $(INSTALL_DIR) $(IDIR_MPG123)/usr/bin $(IDIR_MPG123)/usr/lib - $(INSTALL_DIR) $(IDIR_MPG123)/usr/lib/mpg123 - $(CP) $(WRKINST)/usr/lib/libmpg123.so* $(IDIR_MPG123)/usr/lib - $(CP) $(WRKINST)/usr/lib/mpg123/*.la $(IDIR_MPG123)/usr/lib/mpg123 - $(CP) $(WRKINST)/usr/lib/mpg123/*.so $(IDIR_MPG123)/usr/lib/mpg123 + $(INSTALL_DIR) $(IDIR_MPG123)/usr/bin $(INSTALL_BIN) $(WRKINST)/usr/bin/mpg123 \ $(IDIR_MPG123)/usr/bin diff --git a/package/mpg123/patches/patch-build_ltmain_sh b/package/mpg123/patches/patch-build_ltmain_sh index f2c5aadfa..20cae3022 100644 --- a/package/mpg123/patches/patch-build_ltmain_sh +++ b/package/mpg123/patches/patch-build_ltmain_sh @@ -1,11 +1,11 @@ ---- mpg123-1.12.1.orig/build/ltmain.sh 2010-03-31 10:28:55.000000000 +0200 -+++ mpg123-1.12.1/build/ltmain.sh 2011-01-16 00:25:49.000000000 +0100 -@@ -4765,7 +4765,7 @@ func_mode_link () - # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC - # @file GCC response files +--- mpg123-1.13.3.orig/build/ltmain.sh 2011-04-03 09:52:37.000000000 +0200 ++++ mpg123-1.13.3/build/ltmain.sh 2011-05-02 15:02:20.131176071 +0200 +@@ -5840,7 +5840,7 @@ func_mode_link () + # -O*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \ -- -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*) -+ -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-fstack-protector*|-flto) + -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \ +- -O*|-flto*|-fwhopr*|-fuse-linker-plugin) ++ -O*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*) func_quote_for_eval "$arg" arg="$func_quote_for_eval_result" func_append compile_command " $arg" diff --git a/scripts/scan-pkgs.sh b/scripts/scan-pkgs.sh index b267b61e6..7d94f5976 100644 --- a/scripts/scan-pkgs.sh +++ b/scripts/scan-pkgs.sh @@ -104,6 +104,10 @@ if [[ -n $ADK_COMPILE_AUTOMAKE ]]; then NEED_AUTOCONF="$NEED_AUTOCONF automake" fi +if [[ -n $ADK_COMPILE_LIBTOOL ]]; then + NEED_AUTOMAKE="$NEED_AUTOMAKE libtool" +fi + if [[ -n $ADK_PACKAGE_SQUID ]]; then NEED_GXX="$NEED_GXX squid" fi @@ -256,6 +260,13 @@ if [[ -n $NEED_AUTOCONF ]]; then fi fi +if [[ -n $NEED_AUTOMAKE ]]; then + if ! which automake >/dev/null 2>&1; then + echo >&2 You need automake to build $NEED_AUTOMAKE + out=1 + fi +fi + if [[ -n $NEED_INTL ]]; then if ! which intltool-update >/dev/null 2>&1; then echo >&2 You need intltool to build $NEED_INTL diff --git a/toolchain/gmp/Makefile b/toolchain/gmp/Makefile index ed0103ae9..c96ad76b2 100644 --- a/toolchain/gmp/Makefile +++ b/toolchain/gmp/Makefile @@ -12,15 +12,19 @@ endif $(WRKBUILD)/.headers: $(WRKBUILD)/.configured: +# for cygwin and ubunto on amd64 ifneq (,$(filter CYGWIN%,${OStype})) - (cd $(WRKBUILD); cp configfsf.guess config.guess); + (cd $(WRKBUILD); cp configfsf.guess config.guess) +endif +ifeq (${OStype},Linux) + (cd $(WRKBUILD); cp configfsf.guess config.guess) endif (cd $(WRKBUILD); \ ./configure \ --prefix=$(STAGING_HOST_DIR) \ --disable-shared \ --enable-static \ - ); + ) touch $@ $(WRKBUILD)/.compiled: $(WRKBUILD)/.configured |