diff options
Diffstat (limited to 'package')
498 files changed, 26605 insertions, 6857 deletions
diff --git a/package/.template/Makefile b/package/.template/Makefile index e5593b3fb..b9b1c125e 100644 --- a/package/.template/Makefile +++ b/package/.template/Makefile @@ -14,6 +14,8 @@ PKG_DEPENDS:= add dependendant package names PKG_BUILDDEP:= add packages which need to be compiled PKG_URL:= add project url PKG_SITES:= add download url without package name +# alternatively use a pre-defined set of mirrors, see mk/mirrors.mk: +#PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=sub/path/} # if more than one binary package is created, add symbol names of all here # leave variable empty, when no binary package is created. You can set it @@ -30,7 +32,7 @@ PKG_SITES:= add download url without package name #PKGSD_SUBPKG1:= # define your flavours for your package here, WITH_SSL f.e. -#PKG_FLAVOURS:= WITH_SSL +#PKG_FLAVOURS_PKGNAME:= WITH_SSL # flavour description #PKGFD_WITH_SSL:= enable SSL support # flavour runtime dependency, package name 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/DirectFB/patches/patch-ltmain_sh b/package/DirectFB/patches/patch-ltmain_sh new file mode 100644 index 000000000..cd25bbd95 --- /dev/null +++ b/package/DirectFB/patches/patch-ltmain_sh @@ -0,0 +1,11 @@ +--- DirectFB-1.4.11.orig/ltmain.sh 2010-11-03 11:14:45.000000000 +0100 ++++ DirectFB-1.4.11/ltmain.sh 2011-01-14 00:24:52.000000000 +0100 +@@ -4765,7 +4765,7 @@ func_mode_link () + # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC + # @file GCC response files + -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) + func_quote_for_eval "$arg" + arg="$func_quote_for_eval_result" + func_append compile_command " $arg" 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..9ca2a4a6c --- /dev/null +++ b/package/ImageMagick/patches/patch-config_ltmain_sh @@ -0,0 +1,39 @@ +--- 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-14 00:59:45.000000000 +0100 +@@ -5091,7 +5091,7 @@ func_mode_link () + # @file GCC response files + # -tp=* Portland pgcc target processor selection + -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \ +- -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*) ++ -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|-fstack-protector*|-flto) + func_quote_for_eval "$arg" + arg="$func_quote_for_eval_result" + func_append compile_command " $arg" +@@ -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/alsa-lib/patches/patch-ltmain_sh b/package/alsa-lib/patches/patch-ltmain_sh new file mode 100644 index 000000000..7c980c176 --- /dev/null +++ b/package/alsa-lib/patches/patch-ltmain_sh @@ -0,0 +1,11 @@ +--- alsa-lib-1.0.22.orig/ltmain.sh 2006-11-25 12:04:27.000000000 +0100 ++++ alsa-lib-1.0.22/ltmain.sh 2011-01-14 11:34:46.000000000 +0100 +@@ -1623,7 +1623,7 @@ EOF + # -pg pass through profiling flag for GCC + # @file GCC response files + -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*|-pg| \ +- -t[45]*|-txscale*|@*) ++ -t[45]*|-txscale*|@*|-fstack-protector*|-flto) + + # Unknown arguments in both finalize_command and compile_command need + # to be aesthetically quoted because they are evaled later. diff --git a/package/alsa-utils/Makefile b/package/alsa-utils/Makefile index 288faafdf..c134b85be 100644 --- a/package/alsa-utils/Makefile +++ b/package/alsa-utils/Makefile @@ -14,10 +14,10 @@ PKG_BUILDDEP:= alsa-lib PKG_URL:= http://www.alsa-project.org/ PKG_SITES:= ftp://ftp.alsa-project.org/pub/utils/ -PKG_FLAVOURS:= WITH_ALSAMIXER -PKGFS_WITH_ALSAMIXER:= libncurses -PKGFD_WITH_ALSAMIXER:= include alsamixer ncurses applet -PKGFB_WITH_ALSAMIXER:= ncurses +PKG_FLAVOURS_ALSA_UTILS:= WITH_ALSAMIXER +PKGFS_WITH_ALSAMIXER:= libncurses +PKGFD_WITH_ALSAMIXER:= include alsamixer ncurses applet +PKGFB_WITH_ALSAMIXER:= ncurses DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 diff --git a/package/apr/Makefile b/package/apr/Makefile index 096981833..2b6c05305 100644 --- a/package/apr/Makefile +++ b/package/apr/Makefile @@ -13,7 +13,7 @@ PKG_DEPENDS:= libpthread PKG_URL:= http://apr.apache.org/ PKG_SITES:= http://gd.tuwien.ac.at/infosys/servers/http/apache/dist/${PKG_NAME}/ -PKG_FLAVOURS:= WITH_IPV6 +PKG_FLAVOURS_APR:= WITH_IPV6 PKGFD_WITH_IPV6:= enable IPv6 support include ${TOPDIR}/mk/package.mk @@ -28,7 +28,6 @@ CONFIGURE_ENV+= ac_cv_file__dev_zero=yes CONFIGURE_ENV+= apr_cv_process_shared_works=no CONFIGURE_ENV+= ac_cv_lib_nsl_gethostbyname=no CONFIGURE_ENV+= apr_cv_tcp_nodelay_with_cork=no - CONFIGURE_ARGS+= --with-devrandom=/dev/urandom \ --enable-threads diff --git a/package/apr/patches/patch-build_ltmain_sh b/package/apr/patches/patch-build_ltmain_sh new file mode 100644 index 000000000..0ce8441f6 --- /dev/null +++ b/package/apr/patches/patch-build_ltmain_sh @@ -0,0 +1,11 @@ +--- apr-1.4.2.orig/build/ltmain.sh 2010-01-21 08:59:41.000000000 +0100 ++++ apr-1.4.2/build/ltmain.sh 2011-01-14 11:41:48.000000000 +0100 +@@ -4765,7 +4765,7 @@ func_mode_link () + # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC + # @file GCC response files + -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) + func_quote_for_eval "$arg" + arg="$func_quote_for_eval_result" + func_append compile_command " $arg" diff --git a/package/arpd/Makefile b/package/arpd/Makefile index 3494c2115..722faae9d 100644 --- a/package/arpd/Makefile +++ b/package/arpd/Makefile @@ -23,7 +23,7 @@ $(eval $(call PKG_template,ARPD,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_ CONFIGURE_ARGS+= --with-libdnet=${STAGING_TARGET_DIR}/usr \ --with-libevent=${STAGING_TARGET_DIR}/usr \ --with-libpcap=${STAGING_TARGET_DIR}/usr -MAKE_FLAGS+= CCOPT="${TARGET_CFLAGS}" \ +MAKE_FLAGS+= CFLAGS="${TCFLAGS}" \ INCLS="-I. -I${STAGING_TARGET_DIR}/usr/include" \ LIBS="-L${STAGING_TARGET_DIR}/usr/lib -lpcap -ldnet -levent" 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/aufs2-util/Makefile b/package/aufs2-util/Makefile index 4078fa8e1..f42767dbe 100644 --- a/package/aufs2-util/Makefile +++ b/package/aufs2-util/Makefile @@ -4,26 +4,44 @@ include $(TOPDIR)/rules.mk PKG_NAME:= aufs2-util -PKG_VERSION:= 130809 +PKG_VERSION:= 2-100111 PKG_RELEASE:= 1 +PKG_MD5SUM:= 1854f5ab560dd375b22f6e2b747cb412 PKG_DESCR:= aufs2 utilities PKG_SECTION:= fs PKG_URL:= http://aufs.sf.net/ +# created from git via: +# $ git archive --format tar aufs2.1 | \ +# gzip -9 -c >../aufs2-util-2-$(date +%d%m%g).tar.gz + +PKG_SITES:= http://nwl.cc/~n0-1/ +WRKDIST= ${WRKDIR} + PKG_HOST_DEPENDS:= !cygwin !freebsd !openbsd !netbsd -NO_DISTFILES:= 1 +PKG_SUBPKGS:= AUFS2_UTIL LIBAU +PKGSD_LIBAU:= aufs2 userspace library include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,AUFS2_UTIL,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +$(eval $(call PKG_template,LIBAU,libau,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBAU},${PKG_SECTION})) CONFIG_STYLE:= manual -MAKE_FLAGS+= KDIR=${LINUX_DIR} +XAKE_FLAGS+= Install=install HOSTCPPFLAGS="-I${LINUX_HEADER_DIR}/include" post-install: $(INSTALL_DIR) $(IDIR_AUFS2_UTIL)/sbin - $(INSTALL_BIN) ${WRKINST}/sbin/{u,}mount.aufs \ + $(INSTALL_BIN) ${WRKINST}/sbin/{{u,}mount.aufs,auplink} \ $(IDIR_AUFS2_UTIL)/sbin + $(INSTALL_DIR) $(IDIR_AUFS2_UTIL)/usr/bin + $(INSTALL_BIN) ${WRKINST}/usr/bin/au{brsync,chk} \ + $(IDIR_AUFS2_UTIL)/usr/bin + $(INSTALL_DIR) $(IDIR_AUFS2_UTIL)/etc/default + $(INSTALL_DATA) ${WRKINST}/etc/default/aufs \ + $(IDIR_AUFS2_UTIL)/etc/default + $(INSTALL_DIR) $(IDIR_LIBAU)/usr/lib + ${CP} ${WRKINST}/usr/lib/libau* ${IDIR_LIBAU}/usr/lib include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/aufs2-util/patches/patch-Makefile b/package/aufs2-util/patches/patch-Makefile index 5cfb193c3..d77ea81ec 100644 --- a/package/aufs2-util/patches/patch-Makefile +++ b/package/aufs2-util/patches/patch-Makefile @@ -1,33 +1,47 @@ - - explicitly use the host cc to compile c2sh and c2tmac - (using per-target local variable assignments is an elegant - way for not having to define explicit rules for the targets) - - dont try setting owner and group of installed files ---- aufs2-util-130809.orig/Makefile 2009-08-13 14:59:49.000000000 +0200 -+++ aufs2-util-130809/Makefile 2009-08-23 18:05:03.909726416 +0200 -@@ -54,6 +54,11 @@ ${Dummy}: ${LibSoObj} - ${LibSo}: ${Dummy} - ln -f $< $@ +--- w-aufs2-util-2-100111-1.orig/Makefile 2011-01-07 05:00:54.000000000 +0100 ++++ w-aufs2-util-2-100111-1/Makefile 2011-01-10 23:43:23.000000000 +0100 +@@ -15,6 +15,11 @@ + # along with this program; if not, write to the Free Software + # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +c2sh c2tmac: CC = ${HOSTCC} -+c2sh c2tmac: CFLAGS="-I${KDIR}/include" -+c2sh c2tmac: LDFLAGS= -+c2sh c2tmac: CPPFLAGS= ++c2sh c2tmac: CFLAGS= ${HOSTCFLAGS} ++c2sh c2tmac: LDFLAGS= ${HOSTLDFLAGS} ++c2sh c2tmac: CPPFLAGS= ${HOSTCPPFLAGS} -I./libau -I${LINUX_HEADER_DIR}/include + - etc_default_aufs: c2sh aufs.shlib - ${RM} $@ - echo '# aufs variables for shell scripts' > $@ -@@ -86,12 +91,12 @@ install_ulib: File = ${LibSo} - install_ulib: Tgt = ${DESTDIR}/ulib - install_sbin install_ubin install_man install_ulib: ${File} - install -d ${Tgt} -- install -m 755 -o root -g root -p ${Opt} ${File} ${Tgt} -+ install -m 755 -p ${Opt} ${File} ${Tgt} - install_etc: File = etc_default_aufs + CFLAGS += -I./libau + CFLAGS += -O -Wall + +@@ -28,13 +33,10 @@ LibUtilObj = proc_mnt.o br.o plink.o mta + LibUtilHdr = au_util.h + export + +-all: ver_test ${Man} ${Bin} ${Etc} ++all: ${Man} ${Bin} ${Etc} + ${MAKE} -C libau $@ + ln -sf ./libau/libau*.so . + +-ver_test: ver +- ./ver +- + ${Bin}: LDFLAGS += -static -s + ${Bin}: LDLIBS = -L. -lautil + ${BinObj}: %.o: %.c ${LibUtilHdr} ${LibUtil} +@@ -63,7 +65,7 @@ aufs.5: aufs.in.5 c2tmac + }' aufs.in.5 >> $@ + chmod a-w $@ + +-.INTERMEDIATE: c2sh c2tmac ver ++.INTERMEDIATE: c2sh c2tmac + + Install = install -o root -g root -p + install_sbin: File = mount.aufs umount.aufs auplink +@@ -77,7 +79,7 @@ install_etc: File = etc_default_aufs install_etc: Tgt = ${DESTDIR}/etc/default/aufs install_etc: ${File} install -d $(dir ${Tgt}) -- install -m 644 -o root -g root -p -T ${File} ${Tgt} -+ install -m 644 -p -T ${File} ${Tgt} - - # do not inlcude install_ulib here - install: install_man install_sbin install_ubin install_etc +- ${Install} -m 644 -T ${File} ${Tgt} ++ ${Install} -m 644 ${File} ${Tgt} + install_man: File = aufs.5 + install_man: Tgt = ${DESTDIR}/usr/share/man/man5 + install_man: ${File} diff --git a/package/aufs2-util/src/COPYING b/package/aufs2-util/src/COPYING deleted file mode 100644 index f90922eea..000000000 --- a/package/aufs2-util/src/COPYING +++ /dev/null @@ -1,340 +0,0 @@ - GNU GENERAL PUBLIC LICENSE - Version 2, June 1991 - - Copyright (C) 1989, 1991 Free Software Foundation, Inc. - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -License is intended to guarantee your freedom to share and change free -software--to make sure the software is free for all its users. This -General Public License applies to most of the Free Software -Foundation's software and to any other program whose authors commit to -using it. (Some other Free Software Foundation software is covered by -the GNU Lesser General Public License instead.) You can apply it to -your programs, too. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -this service if you wish), that you receive source code or can get it -if you want it, that you can change the software or use pieces of it -in new free programs; and that you know you can do these things. - - To protect your rights, we need to make restrictions that forbid -anyone to deny you these rights or to ask you to surrender the rights. -These restrictions translate to certain responsibilities for you if you -distribute copies of the software, or if you modify it. - - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must give the recipients all the rights that -you have. You must make sure that they, too, receive or can get the -source code. And you must show them these terms so they know their -rights. - - We protect your rights with two steps: (1) copyright the software, and -(2) offer you this license which gives you legal permission to copy, -distribute and/or modify the software. - - Also, for each author's protection and ours, we want to make certain -that everyone understands that there is no warranty for this free -software. If the software is modified by someone else and passed on, we -want its recipients to know that what they have is not the original, so -that any problems introduced by others will not reflect on the original -authors' reputations. - - Finally, any free program is threatened constantly by software -patents. We wish to avoid the danger that redistributors of a free -program will individually obtain patent licenses, in effect making the -program proprietary. To prevent this, we have made it clear that any -patent must be licensed for everyone's free use or not licensed at all. - - The precise terms and conditions for copying, distribution and -modification follow. - - GNU GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License applies to any program or other work which contains -a notice placed by the copyright holder saying it may be distributed -under the terms of this General Public License. The "Program", below, -refers to any such program or work, and a "work based on the Program" -means either the Program or any derivative work under copyright law: -that is to say, a work containing the Program or a portion of it, -either verbatim or with modifications and/or translated into another -language. (Hereinafter, translation is included without limitation in -the term "modification".) Each licensee is addressed as "you". - -Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running the Program is not restricted, and the output from the Program -is covered only if its contents constitute a work based on the -Program (independent of having been made by running the Program). -Whether that is true depends on what the Program does. - - 1. You may copy and distribute verbatim copies of the Program's -source code as you receive it, in any medium, provided that you -conspicuously and appropriately publish on each copy an appropriate -copyright notice and disclaimer of warranty; keep intact all the -notices that refer to this License and to the absence of any warranty; -and give any other recipients of the Program a copy of this License -along with the Program. - -You may charge a fee for the physical act of transferring a copy, and -you may at your option offer warranty protection in exchange for a fee. - - 2. You may modify your copy or copies of the Program or any portion -of it, thus forming a work based on the Program, and copy and -distribute such modifications or work under the terms of Section 1 -above, provided that you also meet all of these conditions: - - a) You must cause the modified files to carry prominent notices - stating that you changed the files and the date of any change. - - b) You must cause any work that you distribute or publish, that in - whole or in part contains or is derived from the Program or any - part thereof, to be licensed as a whole at no charge to all third - parties under the terms of this License. - - c) If the modified program normally reads commands interactively - when run, you must cause it, when started running for such - interactive use in the most ordinary way, to print or display an - announcement including an appropriate copyright notice and a - notice that there is no warranty (or else, saying that you provide - a warranty) and that users may redistribute the program under - these conditions, and telling the user how to view a copy of this - License. (Exception: if the Program itself is interactive but - does not normally print such an announcement, your work based on - the Program is not required to print an announcement.) - -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Program, -and can be reasonably considered independent and separate works in -themselves, then this License, and its terms, do not apply to those -sections when you distribute them as separate works. But when you -distribute the same sections as part of a whole which is a work based -on the Program, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote it. - -Thus, it is not the intent of this section to claim rights or contest -your rights to work written entirely by you; rather, the intent is to -exercise the right to control the distribution of derivative or -collective works based on the Program. - -In addition, mere aggregation of another work not based on the Program -with the Program (or with a work based on the Program) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. - - 3. You may copy and distribute the Program (or a work based on it, -under Section 2) in object code or executable form under the terms of -Sections 1 and 2 above provided that you also do one of the following: - - a) Accompany it with the complete corresponding machine-readable - source code, which must be distributed under the terms of Sections - 1 and 2 above on a medium customarily used for software interchange; or, - - b) Accompany it with a written offer, valid for at least three - years, to give any third party, for a charge no more than your - cost of physically performing source distribution, a complete - machine-readable copy of the corresponding source code, to be - distributed under the terms of Sections 1 and 2 above on a medium - customarily used for software interchange; or, - - c) Accompany it with the information you received as to the offer - to distribute corresponding source code. (This alternative is - allowed only for noncommercial distribution and only if you - received the program in object code or executable form with such - an offer, in accord with Subsection b above.) - -The source code for a work means the preferred form of the work for -making modifications to it. For an executable work, complete source -code means all the source code for all modules it contains, plus any -associated interface definition files, plus the scripts used to -control compilation and installation of the executable. However, as a -special exception, the source code distributed need not include -anything that is normally distributed (in either source or binary -form) with the major components (compiler, kernel, and so on) of the -operating system on which the executable runs, unless that component -itself accompanies the executable. - -If distribution of executable or object code is made by offering -access to copy from a designated place, then offering equivalent -access to copy the source code from the same place counts as -distribution of the source code, even though third parties are not -compelled to copy the source along with the object code. - - 4. You may not copy, modify, sublicense, or distribute the Program -except as expressly provided under this License. Any attempt -otherwise to copy, modify, sublicense or distribute the Program is -void, and will automatically terminate your rights under this License. -However, parties who have received copies, or rights, from you under -this License will not have their licenses terminated so long as such -parties remain in full compliance. - - 5. You are not required to accept this License, since you have not -signed it. However, nothing else grants you permission to modify or -distribute the Program or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Program (or any work based on the -Program), you indicate your acceptance of this License to do so, and -all its terms and conditions for copying, distributing or modifying -the Program or works based on it. - - 6. Each time you redistribute the Program (or any work based on the -Program), the recipient automatically receives a license from the -original licensor to copy, distribute or modify the Program subject to -these terms and conditions. You may not impose any further -restrictions on the recipients' exercise of the rights granted herein. -You are not responsible for enforcing compliance by third parties to -this License. - - 7. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot -distribute so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you -may not distribute the Program at all. For example, if a patent -license would not permit royalty-free redistribution of the Program by -all those who receive copies directly or indirectly through you, then -the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Program. - -If any portion of this section is held invalid or unenforceable under -any particular circumstance, the balance of the section is intended to -apply and the section as a whole is intended to apply in other -circumstances. - -It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system, which is -implemented by public license practices. Many people have made -generous contributions to the wide range of software distributed -through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot -impose that choice. - -This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. - - 8. If the distribution and/or use of the Program is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Program under this License -may add an explicit geographical distribution limitation excluding -those countries, so that distribution is permitted only in or among -countries not thus excluded. In such case, this License incorporates -the limitation as if written in the body of this License. - - 9. The Free Software Foundation may publish revised and/or new versions -of the General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - -Each version is given a distinguishing version number. If the Program -specifies a version number of this License which applies to it and "any -later version", you have the option of following the terms and conditions -either of that version or of any later version published by the Free -Software Foundation. If the Program does not specify a version number of -this License, you may choose any version ever published by the Free Software -Foundation. - - 10. If you wish to incorporate parts of the Program into other free -programs whose distribution conditions are different, write to the author -to ask for permission. For software which is copyrighted by the Free -Software Foundation, write to the Free Software Foundation; we sometimes -make exceptions for this. Our decision will be guided by the two goals -of preserving the free status of all derivatives of our free software and -of promoting the sharing and reuse of software generally. - - NO WARRANTY - - 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY -FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN -OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES -PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED -OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS -TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE -PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, -REPAIR OR CORRECTION. - - 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR -REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, -INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING -OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED -TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY -YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER -PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE -POSSIBILITY OF SUCH DAMAGES. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -convey the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - <one line to give the program's name and a brief idea of what it does.> - Copyright (C) <year> <name of author> - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - - -Also add information on how to contact you by electronic and paper mail. - -If the program is interactive, make it output a short notice like this -when it starts in an interactive mode: - - Gnomovision version 69, Copyright (C) year name of author - Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, the commands you use may -be called something other than `show w' and `show c'; they could even be -mouse-clicks or menu items--whatever suits your program. - -You should also get your employer (if you work as a programmer) or your -school, if any, to sign a "copyright disclaimer" for the program, if -necessary. Here is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the program - `Gnomovision' (which makes passes at compilers) written by James Hacker. - - <signature of Ty Coon>, 1 April 1989 - Ty Coon, President of Vice - -This General Public License does not permit incorporating your program into -proprietary programs. If your program is a subroutine library, you may -consider it more useful to permit linking proprietary applications with the -library. If this is what you want to do, use the GNU Lesser General -Public License instead of this License. diff --git a/package/aufs2-util/src/Makefile b/package/aufs2-util/src/Makefile deleted file mode 100644 index 544dfc538..000000000 --- a/package/aufs2-util/src/Makefile +++ /dev/null @@ -1,93 +0,0 @@ - -# Copyright (C) 2005-2010 Junjiro R. Okajima -# -# This program, aufs is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -CFLAGS += -I./libau -CFLAGS += -O -Wall - -Cmd = umount.aufs auchk aubrsync -Man = aufs.5 -Etc = etc_default_aufs -Bin = auplink mount.aufs #auctl -BinObj = $(addsuffix .o, ${Bin}) -LibUtil = libautil.a -LibUtilObj = proc_mnt.o br.o plink.o mtab.o -LibUtilHdr = au_util.h -export - -all: ${Man} ${Bin} ${Etc} - ${MAKE} -C libau $@ - ln -sf ./libau/libau*.so . - -${Bin}: LDFLAGS += -static -s -${Bin}: LDLIBS = -L. -lautil -${BinObj}: %.o: %.c ${LibUtilHdr} ${LibUtil} - -${LibUtilObj}: %.o: %.c ${LibUtilHdr} -#${LibUtil}: ${LibUtil}(${LibUtilObj}) -${LibUtil}: $(foreach o, ${LibUtilObj}, ${LibUtil}(${o})) -.NOTPARALLEL: ${LibUtil} - -etc_default_aufs: c2sh aufs.shlib - ${RM} $@ - echo '# aufs variables for shell scripts' > $@ - ./c2sh >> $@ - echo >> $@ - sed -e '0,/^$$/d' aufs.shlib >> $@ - -aufs.5: aufs.in.5 c2tmac - ${RM} $@ - ./c2tmac > $@ - awk '{ \ - gsub(/\140[^\047]*\047/, "\\[oq]&\\[cq]"); \ - gsub(/\\\[oq\]\140/, "\\[oq]"); \ - gsub(/\047\\\[cq\]/, "\\[cq]"); \ - gsub(/\047/, "\\[aq]"); \ - print; \ - }' aufs.in.5 >> $@ - chmod a-w $@ - -.INTERMEDIATE: c2sh c2tmac - -Install = install -o root -g root -p -install_sbin: File = mount.aufs umount.aufs auplink -install_sbin: Tgt = ${DESTDIR}/sbin -install_ubin: File = auchk aubrsync #auctl -install_ubin: Tgt = ${DESTDIR}/usr/bin -install_sbin install_ubin: ${File} - install -d ${Tgt} - ${Install} -m 755 ${File} ${Tgt} -install_etc: File = etc_default_aufs -install_etc: Tgt = ${DESTDIR}/etc/default/aufs -install_etc: ${File} - install -d $(dir ${Tgt}) - ${Install} -m 644 -T ${File} ${Tgt} -install_man: File = aufs.5 -install_man: Tgt = ${DESTDIR}/usr/share/man/man5 -install_man: ${File} - install -d ${Tgt} - ${Install} -m 644 ${File} ${Tgt} -install_ulib: - ${MAKE} -C libau $@ - -install: install_man install_sbin install_ubin install_etc install_ulib - -clean: - ${RM} ${Man} ${Bin} ${Etc} ${LibUtil} libau.so* *~ - ${RM} ${BinObj} ${LibUtilObj} - ${MAKE} -C libau $@ - --include priv.mk diff --git a/package/aufs2-util/src/README b/package/aufs2-util/src/README deleted file mode 100644 index 1e1f45422..000000000 --- a/package/aufs2-util/src/README +++ /dev/null @@ -1,46 +0,0 @@ - -Utilities for aufs2 -http://aufs.sf.net -J. R. Okajima - -These utilities are always necessary for aufs2. -If you forget to install them, your aufs may not work correctly. -And these are not for aufs1 essentially, except aubrsync. See below in -detail. - -Makefile in this tree has some customizable make-variables. -- KDIR - specify your kernel source path if necessary -- DESTDIR - specify your install path if necessary. - some commands have to be installed under /sbin. - -o /sbin/mount.aufs, /sbin/umount.aufs - Helpers for util-linux-ng package. You should NOT invoke them - manually. Just install them by "make install". - -o /sbin/auplink - Handles aufs pseudo-link at remount/unmount time. You can invoke it - manually at anytime. - -o /usr/bin/auchk - Similar to generic fsck. Checks whether a branch is healthy or not - from aufs's point of view. - -o /usr/bin/aubrsync - Move files from the upper writable branch to the lower branch. - If you use this script with aufs1, then you need to install aufs.shlib - to /usr/lib/aufs.shlib. Currently only the 20080211 version is tested - for aufs1. - The development of this script is sponcered by ASUSTek Computer Inc. - (http://www.asus.com/). - Kindly they agreed that I keep my aufs work as free software as it has - been. - -o /etc/default/aufs - A library for shell scripts. - - -# Local variables: ; -# mode: text; -# End: ; diff --git a/package/aufs2-util/src/au_util.h b/package/aufs2-util/src/au_util.h deleted file mode 100644 index 21b965510..000000000 --- a/package/aufs2-util/src/au_util.h +++ /dev/null @@ -1,67 +0,0 @@ -/* - * Copyright (C) 2005-2009 Junjiro Okajima - * - * This program, aufs is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - */ - -#ifndef __AUFS_UTIL_H__ -#define __AUFS_UTIL_H__ - -#include <errno.h> -#include <error.h> - -/* - * error_at_line() is decleared with (__printf__, 5, 6) attribute, - * and our compiler produces a warning unless args is not given. - * __VA_ARGS__ does not help the attribute. - */ -#define AuFin(fmt, args...) \ - error_at_line(errno, errno, __FILE__, __LINE__, fmt, ##args) - -#ifdef DEBUG -#define MTab "/tmp/mtab" -#else -#define MTab "/etc/mtab" -#endif - -/* proc_mounts.c */ -struct mntent; -int au_proc_getmntent(char *mntpnt, struct mntent *rent); - -/* br.c */ -int au_br(char ***br, int *nbr, struct mntent *ent); - -/* plink.c */ -enum { - AuPlink_FLUSH, - AuPlink_CPUP, - AuPlink_LIST -}; -int au_plink(char cwd[], int cmd, int begin_maint, int end_maint); -void au_plink_maint(char *path); - -/* mtab.c */ -void au_print_ent(struct mntent *ent); -int au_update_mtab(char *mntpnt, int do_remount, int do_verbose); - -#define _Dpri(fmt, ...) printf("%s:%d:" fmt, \ - __func__, __LINE__, ##__VA_ARGS__) -#ifdef DEBUG -#define Dpri(fmt, ...) _Dpri(fmt, ##__VA_ARGS__) -#else -#define Dpri(fmt, ...) do { } while(0) -#endif - -#endif /* __AUFS_UTIL_H__ */ diff --git a/package/aufs2-util/src/aubrsync b/package/aufs2-util/src/aubrsync deleted file mode 100755 index 54adac9cb..000000000 --- a/package/aufs2-util/src/aubrsync +++ /dev/null @@ -1,304 +0,0 @@ -#!/bin/sh - -# Copyright (C) 2005-2009 Junjiro Okajima -# -# This program, aufs is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -# -# The development of this script is sponcered by ASUSTek Computer Inc. -# Kindly they agreed that I keep my aufs work as free software as it has -# been. -# - -set -eu -#set -x - -me=$(basename $0) -EEcho() # str -{ - echo ${me}: $@ 1>&2 -} - -f=/sbin/mount.aufs -test ! -x $f && EEcho $f is not installed && exit 1 - -# special handling for backward compatibility. -# -# aufs in the donated eeepc is aufs1 20080211 without CONFIG_AUFS_COMPAT. -# /etc/default/aufs was introduced in aufs1 20080922. -# shwh/noshwh was introduced in aufs1 20080310 with CONFIG_AUFS_SHWH. -# noshwh became always available regardless CONFIG_AUFS_SHWH in aufs1 20081117. - -noshwh=1 -AUFS_VERSION=20080211 -f=/etc/default/aufs -if [ -s $f ] -then - . $f -else - echo ${me}: warning, broken $f, assuming aufs is $AUFS_VERSION - f=/usr/lib/aufs.shlib - test ! -s $f && EEcho $f is not installed && exit 1 - . $f - - case $AUFS_VERSION in - 200*) # aufs1 - test $AUFS_VERSION -lt 20081117 && noshwh=0 - ;; - esac - AUFS_SUPER_MAGIC=1635083891 - AUFS_SUPER_MAGIC_HEX=0x61756673 - AUFS_WH_PFX=.wh. - AUFS_WH_PFX2=.wh..wh. - AUFS_WH_DIROPQ=.wh..wh..opq -fi - -######################################## - -_Rsync="rsync --exclude=lost+found" -Rsync="$_Rsync -aHSx --devices --specials --delete-before" -Copy="$Rsync" -Move="$Copy" -RsyncWh="$_Rsync -ptgoHx" - -FindForRm() # rw -{ - echo "find \"$1\" -xdev -depth \( - \( ! -type d - \( -name $AUFS_WH_DIROPQ - -o ! -name ${AUFS_WH_PFX2}\* \) \) - -o \( -type d - ! -name ${AUFS_WH_PFX2}\* - ! -wholename \"$1\" - ! -wholename \"$1/lost+found\" \) - \) -print0" -} - -MoveWh() # rw ro+wh -{ - cd "$1" - find . -xdev -name ${AUFS_WH_PFX}\* ! -name ${AUFS_WH_PFX2}\* \ - -printf '%P\n' | - while read wh - do - f=$(echo "$wh" | sed -e ' - s/^'${AUFS_WH_PFX}'// - t - s:/'${AUFS_WH_PFX}':/: - ') - test -e "$dst/$f" || echo "$wh" - done | - # -v - $RsyncWh --files-from=- ./ "$2" - cd "$OLDPWD" -} - -copy() -{ - $Copy $@ "$mntpnt"/ "$dst" -} - -_move() -{ - set +x - test $hinotify -ne 1 && echo ${me}: warning, -i is not specified - src_is_nfs=0 - test $(stat -f -c %T "$src") = nfs && src_is_nfs=1 - set $quiet - - $Move $@ && - eval $(FindForRm "$src") | - { - if [ $src_is_nfs -eq 1 ] - then - mount -o remount "$mntpnt" - mount -o remount "$src" - fi - xargs -r0 rm -fr #-v - } -} - -move() -{ - _move $@ "$mntpnt"/ "$dst" -} - -move_with_wh() -{ - { - set +x - MoveWh "$src" "$dst" - set $quiet - } && - move --exclude=${AUFS_WH_PFX}\* -} - -# backward compatibility -move_w() -{ - move_with_wh $@ -} - -Usage() -{ - t=$(FindForRm src_branch | sed -e ' - s/"//g - $b - s/$/ \\/') - - cat <<- EOF - $me Options move | move_with_wh | copy \\ - mntpnt src_branch dst_branch [ options for rsync ] - - generic form: - $me [ -w | --wh ] [ -i | --inotify ] Options \\ - mntpnt cmd [ parameters for cmd ] - - Options: - [ -n | --dry_run ] - [ -q | --quiet ] - - The dst_branch must be mounted as writable. - During the operation, the mntpnt is set readonly. - If you are opening a file for writing on the writable branch, - you need to close the file before invoking this script. - The -w or --wh option requires CONFIG_AUFS_SHWH enabled. - The -i or --inotify option requires CONFIG_AUFS_HINOTIFY enabled. - - 'copy' is a shortcut for - $me mntpnt \\ - $Copy mntpnt/ dst_branch - 'move' is a shortcut for - $me mntpnt \\ - "$Move \\ - mntpnt/ dst_branch && \\ - $t |\\ - xargs -r0 rm -fr" - Note: in most cases, you will need '-i' option, and - find(1) is invoked by $me only when rsync(1) - succeded. - 'move_with_wh' is a simple variation of 'move' which moves - whiteouts separately before the actual 'move'. - - If you execute this script under linux-2.6.24 or earlier, the - kernel may produce a harmless warning "inotify.c:NNN - set_dentry_child_flags()". The message was already removed in - linux-2.6.25. - - examples: - - Copy and reflect all the modification (modifed files, newly - created and removed ones) in the upper branch to the lower - branch. This operation is for aufs which has only 2 branches, - and mainly for a system shutdown script. - All files on the upper branch remain. - - $ sudo $me copy /your/aufs /your/upper_branch /your/lower_branch - - - Like above (2 branches), move and reflect all modifications - from upper to lower. Almost all files on the upper branch will - be removed. You can still use this aufs after the - operation. But the inode number may be changed. If your - application which depends upon the inode number was running at - that time, it may not work correctly. - - $ sudo $me move /your/aufs /your/upper_branch /your/lower_branch - EOF - -# - Like above (2 branches), generate a new middle layer like a -# snapshot including whiteouts and make the upper_branch almost -# empty, but untouch the lower_branch. -# -# $ img=/hda1/a.ext2 -# $ dd if=/dev/zero of=\$img bs=4k count=1k -# $ mkfs -t ext2 -F \$img -# $ sudo mount -o rw,loop \$img /your/new_branch -# $ sudo mount -o remount,ins:1:/your/new_branch=ro+wh /your/aufs -# $ sudo $me _move /your/aufs /your/upper_branch /your/lower_branch \\ -# "--remove-source-files \\ -# --exclude=$AUFS_WH_BASE \\ -# --exclude=$AUFS_WH_PLINKDIR \\ -# --exclude=$AUFS_WH_TMPDIR \\ -# /your/upper_branch/ /your/new_branch; \\ -# mount -o remount,ro /your/new_branch" -# EOF -} - -######################################## - -wh=0 -hinotify=0 -quiet=-x -dry_run= -cmd= -cmd_opts= -for i -do - case $i in - -w|--wh) wh=1;; - -i|--inotify) hinotify=1;; - -n|--dry_run) dry_run=echo;; - -q|--quiet) quiet=+x;; - -h|--help) Usage; exit 0;; - --) shift; break;; - *) break;; - esac - shift -done - -test $# -lt 2 && Usage 1>&2 && exit 1 -case "$1" in -_move|move|copy|move_w|move_with_wh) - test $# -lt 4 && Usage 1>&2 && exit 1 - cmd=$1 - SetDir mntpnt "$2" - SetDir src "$3" - SetDir dst "$4" - shift 4 - wh=0 - ;; -*) - SetDir mntpnt "$1" - cmd="$2" - shift 2 - ;; -esac -cmd_opts="$@" - -case $(stat -f -c %T "$mntpnt") in -aufs|UNKNOWN*${AUFS_SUPER_MAGIC_HEX}*) ;; -*) - EEcho "$mntpnt" is not aufs - exit 1 - ;; -esac - -cur_opts=$(MntOpts "$mntpnt") -test ! "$cur_opts" && -EEcho bad /proc/mounts or "$mntpnt" is not mounted && -exit 1 -cur_opts="udba=reval,noshwh,$cur_opts" -test $noshwh -eq 0 && cur_opts=$(echo $cur_opts | sed -e 's/,noshwh//') - -# force flushing the pusedo-links -tmp_opts="remount,ro,udba=reval,noshwh" -test $noshwh -eq 0 && tmp_opts=$(echo $tmp_opts | sed -e 's/,noshwh//') -test $wh -eq 1 && tmp_opts="$tmp_opts,shwh" -test $hinotify -eq 1 && tmp_opts="$tmp_opts,udba=inotify" - -# here we go -trap "$dry_run mount -o remount,$cur_opts \"$mntpnt\"" EXIT -set $quiet -$dry_run mount -o $tmp_opts "$mntpnt" -eval "$dry_run $cmd $cmd_opts" diff --git a/package/aufs2-util/src/auchk b/package/aufs2-util/src/auchk deleted file mode 100755 index 26a3d8027..000000000 --- a/package/aufs2-util/src/auchk +++ /dev/null @@ -1,130 +0,0 @@ -#!/bin/sh - - -# Copyright (C) 2005-2009 Junjiro Okajima -# -# This program, aufs is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -set -eu -#set -x - -EEcho() # str -{ - echo $0: $@ 1>&2 -} - -f=/etc/default/aufs -. $f - -Usage() -{ - echo $0 writable_branch '[...]' -} - -Pass() # title -{ - pass=$(($pass + 1)) - EEcho \[Pass $pass\] $@ -} - -Remove() # file -{ - if [ -d "$1" ] - then - rm -ir "$1" || : - else - rm -v "$1" || : - fi -} - -for i -do - EEcho Checking "$i" for aufs - - cd "$i" - case $(stat -f -c %T .) in - aufs|UNKNOWN*${AUFS_SUPER_MAGIC_HEX}*) - EEcho $i must not be aufs - cd $OLDPWD - continue - ;; - esac - - ######################################## - pass=0 - Pass Illegal whiteout - find . -name '.wh.*' ! -name '.wh..wh.*' -printf '%h\0%f\0' | - xargs -r0n2 | - while read dir wh - do - #echo \""$dir"\" \""$wh"\" - base=$(echo "$wh" | cut -c5-) - test ! -e "$dir/$base" && continue - - ls -ld "$dir/$wh" "$dir/$base" - read -p 'Which to remove [whiteout/real/skip]? ' ans \ - < /dev/tty > /dev/tty 2>&1 - case "$ans" in - [wW]*) Remove "$dir/$wh" || :;; - [rR]*) Remove "$dir/$base" || :;; - *) echo skipped;; - esac - done - - ######################################## - Pass Remained pseudo-links - did=0 - for plink in ${AUFS_WH_PLINKDIR}/* - do - test ! -e "$plink" && break - if [ -d "$plink" ] - then - EEcho illegal "$plink" - continue - fi - - did=1 - #ls -l "$plink" || : - find . -inum $(basename "$plink" | cut -f2 -d .) -ls || : - done - if [ $did -ne 0 ] - then - cat <<- EOF - They will be maintained at remount or umount time, - if you installed aufs helper scripts (See README - in detail). - If "$i" is not a writeble branch of CURRENTLY mounted - aufs, you need to maintain them by yourself. - EOF - fi - - ######################################## - Pass Remained temp files - for tmp in ${AUFS_WH_TMPDIR}/* - do - test ! -e "$tmp" && break - if [ -d "$tmp" ] - then - EEcho illegal "$tmp" - continue - fi - - ls -l "$tmp" || : - rm -i "$tmp" || : - done - - # nothing to do for xinodir - - cd $OLDPWD -done diff --git a/package/aufs2-util/src/aufs.in.5 b/package/aufs2-util/src/aufs.in.5 deleted file mode 100644 index 0cbb14487..000000000 --- a/package/aufs2-util/src/aufs.in.5 +++ /dev/null @@ -1,1684 +0,0 @@ -.\".so aufs.tmac -. -.eo -.de TQ -.br -.ns -.TP \$1 -.. -.de Bu -.IP \(bu 4 -.. -.ec -.\" end of macro definitions -. -.\" ---------------------------------------------------------------------- -.TH aufs 5 \*[AUFS_VERSION] Linux "Linux Aufs User's Manual" -.SH NAME -aufs \- advanced multi layered unification filesystem. version \*[AUFS_VERSION] - -.\" ---------------------------------------------------------------------- -.SH DESCRIPTION -Aufs is a stackable unification filesystem such as Unionfs, which unifies -several directories and provides a merged single directory. -In the early days, aufs was entirely re-designed and re-implemented -Unionfs Version 1.x series. After -many original ideas, approaches and improvements, it -becomes totally different from Unionfs while keeping the basic features. -See Unionfs Version 1.x series for the basic features. -Recently, Unionfs Version 2.x series begin taking some of same -approaches to aufs's. - -.\" ---------------------------------------------------------------------- -.SH MOUNT OPTIONS -At mount-time, the order of interpreting options is, -.RS -.Bu -simple flags, except xino/noxino and udba=inotify -.Bu -branches -.Bu -xino/noxino -.Bu -udba=inotify -.RE - -At remount-time, -the options are interpreted in the given order, -e.g. left to right. -.RS -.Bu -create or remove -whiteout-base(\*[AUFS_WH_BASE]) and -whplink-dir(\*[AUFS_WH_PLINKDIR]) if necessary -.RE -. -.TP -.B br:BRANCH[:BRANCH ...] (dirs=BRANCH[:BRANCH ...]) -Adds new branches. -(cf. Branch Syntax). - -Aufs rejects the branch which is an ancestor or a descendant of another -branch. It is called overlapped. When the branch is loopback-mounted -directory, aufs also checks the source fs-image file of loopback -device. If the source file is a descendant of another branch, it will -be rejected too. - -After mounting aufs or adding a branch, if you move a branch under -another branch and make it descendant of another branch, aufs will not -work correctly. -. -.TP -.B [ add | ins ]:index:BRANCH -Adds a new branch. -The index begins with 0. -Aufs creates -whiteout-base(\*[AUFS_WH_BASE]) and -whplink-dir(\*[AUFS_WH_PLINKDIR]) if necessary. - -If there is the same named file on the lower branch (larger index), -aufs will hide the lower file. -You can only see the highest file. -You will be confused if the added branch has whiteouts (including -diropq), they may or may not hide the lower entries. -.\" It is recommended to make sure that the added branch has no whiteout. - -Even if a process have once mapped a file by mmap(2) with MAP_SHARED -and the same named file exists on the lower branch, -the process still refers the file on the lower(hidden) -branch after adding the branch. -If you want to update the contents of a process address space after -adding, you need to restart your process or open/mmap the file again. -.\" Usually, such files are executables or shared libraries. -(cf. Branch Syntax). -. -.TP -.B del:dir -Removes a branch. -Aufs does not remove -whiteout-base(\*[AUFS_WH_BASE]) and -whplink-dir(\*[AUFS_WH_PLINKDIR]) automatically. -For example, when you add a RO branch which was unified as RW, you -will see whiteout-base or whplink-dir on the added RO branch. - -If a process is referencing the file/directory on the deleting branch -(by open, mmap, current working directory, etc.), aufs will return an -error EBUSY. -. -.TP -.B mod:BRANCH -Modifies the permission flags of the branch. -Aufs creates or removes -whiteout-base(\*[AUFS_WH_BASE]) and/or -whplink-dir(\*[AUFS_WH_PLINKDIR]) if necessary. - -If the branch permission is been changing `rw' to `ro', and a process -is mapping a file by mmap(2) -.\" with MAP_SHARED -on the branch, the process may or may not -be able to modify its mapped memory region after modifying branch -permission flags. -Additioanlly when you enable CONFIG_IMA (in linux-2.6.30 and later), IMA -may produce some wrong messages. But this is equivalent when the -filesystem is changed `ro' in emergency. -(cf. Branch Syntax). -. -.TP -.B append:BRANCH -equivalent to `add:(last index + 1):BRANCH'. -(cf. Branch Syntax). -. -.TP -.B prepend:BRANCH -equivalent to `add:0:BRANCH.' -(cf. Branch Syntax). -. -.TP -.B xino=filename -Use external inode number bitmap and translation table. -When CONFIG_AUFS_EXPORT is enabled, external inode generation table too. -It is set to -<FirstWritableBranch>/\*[AUFS_XINO_FNAME] by default, or -\*[AUFS_XINO_DEFPATH]. -Comma character in filename is not allowed. - -The files are created per an aufs and per a branch filesystem, and -unlinked. So you -cannot find this file, but it exists and is read/written frequently by -aufs. -(cf. External Inode Number Bitmap, Translation Table and Generation Table). - -If you enable CONFIG_SYSFS, the path of xino files are not shown in -/proc/mounts (and /etc/mtab), instead it is shown in -<sysfs>/fs/aufs/si_<id>/xi_path. -Otherwise, it is shown in /proc/mounts unless it is not the default -path. -. -.TP -.B noxino -Stop using external inode number bitmap and translation table. - -If you use this option, -Some applications will not work correctly. -.\" And pseudo link feature will not work after the inode cache is -.\" shrunk. -(cf. External Inode Number Bitmap, Translation Table and Generation Table). -. -.TP -.B trunc_xib -Truncate the external inode number bitmap file. The truncation is done -automatically when you delete a branch unless you do not specify -`notrunc_xib' option. -(cf. External Inode Number Bitmap, Translation Table and Generation Table). -. -.TP -.B notrunc_xib -Stop truncating the external inode number bitmap file when you delete -a branch. -(cf. External Inode Number Bitmap, Translation Table and Generation Table). -. -.TP -.B create_policy | create=CREATE_POLICY -.TQ -.B copyup_policy | copyup | cpup=COPYUP_POLICY -Policies to select one among multiple writable branches. The default -values are `create=tdp' and `cpup=tdp'. -link(2) and rename(2) systemcalls have an exception. In aufs, they -try keeping their operations in the branch where the source exists. -(cf. Policies to Select One among Multiple Writable Branches). -. -.TP -.B verbose | v -Print some information. -Currently, it is only busy file (or inode) at deleting a branch. -. -.TP -.B noverbose | quiet | q | silent -Disable `verbose' option. -This is default value. -. -.TP -.B sum -df(1)/statfs(2) returns the total number of blocks and inodes of -all branches. -Note that there are cases that systemcalls may return ENOSPC, even if -df(1)/statfs(2) shows that aufs has some free space/inode. -. -.TP -.B nosum -Disable `sum' option. -This is default value. -. -.TP -.B dirwh=N -Watermark to remove a dir actually at rmdir(2) and rename(2). - -If the target dir which is being removed or renamed (destination dir) -has a huge number of whiteouts, i.e. the dir is empty logically but -physically, the cost to remove/rename the single -dir may be very high. -It is -required to unlink all of whiteouts internally before issuing -rmdir/rename to the branch. -To reduce the cost of single systemcall, -aufs renames the target dir to a whiteout-ed temporary name and -invokes a pre-created -kernel thread to remove whiteout-ed children and the target dir. -The rmdir/rename systemcall returns just after kicking the thread. - -When the number of whiteout-ed children is less than the value of -dirwh, aufs remove them in a single systemcall instead of passing -another thread. -This value is ignored when the branch is NFS. -The default value is \*[AUFS_DIRWH_DEF]. -.\" . -.\" .TP -.\" .B rdcache=N -. -.TP -.B rdblk=N -Specifies a size of internal VDIR block which is allocated at a time in -byte. -The VDIR block will be allocated several times when necessary. If your -directory has millions of files, you may want to expand this size. -The default value is defined as \*[AUFS_RDBLK_DEF]. -The size has to be lager than NAME_MAX (usually 255) and kmalloc\-able -(the maximum limit depends on your system. at least 128KB is available -for every system). -Whenever you can reset the value to default by specifying rdblk=def. -(cf. Virtual or Vertical Directory Block). -. -.TP -.B rdhash=N -Specifies a size of internal VDIR hash table which is used to compare -the file names under the same named directory on multiple branches. -The VDIR hash table will be allocated in readdir(3)/getdents(2), -rmdir(2) and rename(2) for the existing target directory. If your -directory has millions of files, you may want to expand this size. -The default value is defined as \*[AUFS_RDHASH_DEF]. -The size has to be lager than zero, and it will be multiplied by 4 or 8 -(for 32\-bit and 64\-bit respectively, currently). The result must be -kmalloc\-able -(the maximum limit depends on your system. at least 128KB is available -for every system). -Whenever you can reset the value to default by specifying rdhash=def. -(cf. Virtual or Vertical Directory Block). -. -.TP -.B plink -.TQ -.B noplink -Specifies to use `pseudo link' feature or not. -The default is `plink' which means use this feature. -(cf. Pseudo Link) -. -.TP -.B clean_plink -Removes all pseudo-links in memory. -In order to make pseudo-link permanent, use -`auplink' utility just before one of these operations, -unmounting aufs, -using `ro' or `noplink' mount option, -deleting a branch from aufs, -adding a branch into aufs, -or changing your writable branch as readonly. -If you installed both of /sbin/mount.aufs and /sbin/umount.aufs, and your -mount(8) and umount(8) support them, -`auplink' utility will be executed automatically and flush pseudo-links. -(cf. Pseudo Link) -. -.TP -.B udba=none | reval | inotify -Specifies the level of UDBA (User's Direct Branch Access) test. -(cf. User's Direct Branch Access and Inotify Limitation). -. -.TP -.B diropq=whiteouted | w | always | a -Specifies whether mkdir(2) and rename(2) dir case make the created directory -`opaque' or not. -In other words, to create `\*[AUFS_WH_DIROPQ]' under the created or renamed -directory, or not to create. -When you specify diropq=w or diropq=whiteouted, aufs will not create -it if the -directory was not whiteouted or opaqued. If the directory was whiteouted -or opaqued, the created or renamed directory will be opaque. -When you specify diropq=a or diropq==always, aufs will always create -it regardless -the directory was whiteouted/opaqued or not. -The default value is diropq=w, it means not to create when it is unnecessary. -If you define CONFIG_AUFS_COMPAT at aufs compiling time, the default will be -diropq=a. -You need to consider this option if you are planning to add a branch later -since `diropq' affects the same named directory on the added branch. -. -.TP -.B warn_perm -.TQ -.B nowarn_perm -Adding a branch, aufs will issue a warning about uid/gid/permission of -the adding branch directory, -when they differ from the existing branch's. This difference may or -may not impose a security risk. -If you are sure that there is no problem and want to stop the warning, -use `nowarn_perm' option. -The default is `warn_perm' (cf. DIAGNOSTICS). -. -.TP -.B shwh -.TQ -.B noshwh -By default (noshwh), aufs doesn't show the whiteouts and -they just hide the same named entries in the lower branches. The -whiteout itself also never be appeared. -If you enable CONFIG_AUFS_SHWH and specify `shwh' option, aufs -will show you the name of whiteouts -with keeping its feature to hide the lowers. -Honestly speaking, I am rather confused with this `visible whiteouts.' -But a user who originally requested this feature wrote a nice how-to -document about this feature. See Tips file in the aufs CVS tree. - -.\" ---------------------------------------------------------------------- -.SH Module Parameters -.TP -.B nwkq=N -The number of kernel thread named \*[AUFS_WKQ_NAME]. - -Those threads stay in the system while the aufs module is loaded, -and handle the special I/O requests from aufs. -The default value is \*[AUFS_NWKQ_DEF]. - -The special I/O requests from aufs include a part of copy-up, lookup, -directory handling, pseudo-link, xino file operations and the -delegated access to branches. -For example, Unix filesystems allow you to rmdir(2) which has no write -permission bit, if its parent directory has write permission bit. In aufs, the -removing directory may or may not have whiteout or `dir opaque' mark as its -child. And aufs needs to unlink(2) them before rmdir(2). -Therefore aufs delegates the actual unlink(2) and rmdir(2) to another kernel -thread which has been created already and has a superuser privilege. - -If you enable CONFIG_SYSFS, you can check this value through -<sysfs>/module/aufs/parameters/nwkq. - -. -.TP -.B brs=1 | 0 -Specifies to use the branch path data file under sysfs or not. - -If the number of your branches is large or their path is long -and you meet the limitation of mount(8) ro /etc/mtab, you need to -enable CONFIG_SYSFS and set aufs module parameter brs=1. - -When this parameter is set as 1, aufs does not show `br:' (or dirs=) -mount option through /proc/mounts (and /etc/mtab). So you can -keep yourself from the page limitation of -mount(8) or /etc/mtab. -Aufs shows branch paths through <sysfs>/fs/aufs/si_XXX/brNNN. -Actually the file under sysfs has also a size limitation, but I don't -think it is harmful. - -There is one more side effect in setting 1 to this parameter. -If you rename your branch, the branch path written in /etc/mtab will be -obsoleted and the future remount will meet some error due to the -unmatched parameters (Remember that mount(8) may take the options from -/etc/mtab and pass them to the systemcall). -If you set 1, /etc/mtab will not hold the branch path and you will not -meet such trouble. On the other hand, the entries for the -branch path under sysfs are generated dynamically. So it must not be obsoleted. -But I don't think users want to rename branches so often. - -If CONFIG_SYSFS is disable, this parameter is always set to 0. -. -.TP -.B sysrq=key -Specifies MagicSysRq key for debugging aufs. -You need to enable both of CONFIG_MAGIC_SYSRQ and CONFIG_AUFS_DEBUG. -Currently this is for developers only. -The default is `a'. -. -.TP -.B debug= 0 | 1 -Specifies disable(0) or enable(1) debug print in aufs. -This parameter can be changed dynamically. -You need to enable CONFIG_AUFS_DEBUG. -Currently this is for developers only. -The default is `0' (disable). - -.\" ---------------------------------------------------------------------- -.SH Entries under Sysfs and Debugfs -See linux/Documentation/ABI/*/{sys,debug}fs-aufs. - -.\" ---------------------------------------------------------------------- -.SH Branch Syntax -.TP -.B dir_path[ =permission [ + attribute ] ] -.TQ -.B permission := rw | ro | rr -.TQ -.B attribute := wh | nolwh -dir_path is a directory path. -The keyword after `dir_path=' is a -permission flags for that branch. -Comma, colon and the permission flags string (including `=')in the path -are not allowed. - -Any filesystem can be a branch, But some are not accepted such like -sysfs, procfs and unionfs. -If you specify such filesystems as an aufs branch, aufs will return an error -saying it is unsupported. - -Cramfs in linux stable release has strange inodes and it makes aufs -confused. For example, -.nf -$ mkdir -p w/d1 w/d2 -$ > w/z1 -$ > w/z2 -$ mkcramfs w cramfs -$ sudo mount -t cramfs -o ro,loop cramfs /mnt -$ find /mnt -ls - 76 1 drwxr-xr-x 1 jro 232 64 Jan 1 1970 /mnt - 1 1 drwxr-xr-x 1 jro 232 0 Jan 1 1970 /mnt/d1 - 1 1 drwxr-xr-x 1 jro 232 0 Jan 1 1970 /mnt/d2 - 1 1 -rw-r--r-- 1 jro 232 0 Jan 1 1970 /mnt/z1 - 1 1 -rw-r--r-- 1 jro 232 0 Jan 1 1970 /mnt/z2 -.fi - -All these two directories and two files have the same inode with one -as their link count. Aufs cannot handle such inode correctly. -Currently, aufs involves a tiny workaround for such inodes. But some -applications may not work correctly since aufs inode number for such -inode will change silently. -If you do not have any empty files, empty directories or special files, -inodes on cramfs will be all fine. - -A branch should not be shared as the writable branch between multiple -aufs. A readonly branch can be shared. - -The maximum number of branches is configurable at compile time (127 by -default). - -When an unknown permission or attribute is given, aufs sets ro to that -branch silently. - -.SS Permission -. -.TP -.B rw -Readable and writable branch. Set as default for the first branch. -If the branch filesystem is mounted as readonly, you cannot set it `rw.' -.\" A filesystem which does not support link(2) and i_op\->setattr(), for -.\" example FAT, will not be used as the writable branch. -. -.TP -.B ro -Readonly branch and it has no whiteouts on it. -Set as default for all branches except the first one. Aufs never issue -both of write operation and lookup operation for whiteout to this branch. -. -.TP -.B rr -Real readonly branch, special case of `ro', for natively readonly -branch. Assuming the branch is natively readonly, aufs can optimize -some internal operation. For example, if you specify `udba=inotify' -option, aufs does not set inotify for the things on rr branch. -Set by default for a branch whose fs-type is either `iso9660', -`cramfs' or `romfs' (and `squashfs' for linux\-2.6.29 and later). - -When your branch exists on slower device and you have some -capacity on your hdd, you may want to try ulobdev tool in ULOOP sample. -It can cache the contents of the real devices on another faster device, -so you will be able to get the better access performance. -The ulobdev tool is for a generic block device, and the ulohttp is for a -filesystem image on http server. -If you want to spin down your hdd to save the -battery life or something, then you may want to use ulobdev to save the -access to the hdd, too. -See $AufsCVS/sample/uloop in detail. - -.SS Attribute -. -.TP -.B wh -Readonly branch and it has/might have whiteouts on it. -Aufs never issue write operation to this branch, but lookup for whiteout. -Use this as `<branch_dir>=ro+wh'. -. -.TP -.B nolwh -Usually, aufs creates a whiteout as a hardlink on a writable -branch. This attributes prohibits aufs to create the hardlinked -whiteout, including the source file of all hardlinked whiteout -(\*[AUFS_WH_BASE].) -If you do not like a hardlink, or your writable branch does not support -link(2), then use this attribute. -But I am afraid a filesystem which does not support link(2) natively -will fail in other place such as copy-up. -Use this as `<branch_dir>=rw+nolwh'. -Also you may want to try `noplink' mount option, while it is not recommended. - -.\" .SS FUSE as a branch -.\" A FUSE branch needs special attention. -.\" The struct fuse_operations has a statfs operation. It is OK, but the -.\" parameter is struct statvfs* instead of struct statfs*. So almost -.\" all user\-space implementation will call statvfs(3)/fstatvfs(3) instead of -.\" statfs(2)/fstatfs(2). -.\" In glibc, [f]statvfs(3) issues [f]statfs(2), open(2)/read(2) for -.\" /proc/mounts, -.\" and stat(2) for the mountpoint. With this situation, a FUSE branch will -.\" cause a deadlock in creating something in aufs. Here is a sample -.\" scenario, -.\" .\" .RS -.\" .\" .IN -10 -.\" .Bu -.\" create/modify a file just under the aufs root dir. -.\" .Bu -.\" aufs acquires a write\-lock for the parent directory, ie. the root dir. -.\" .Bu -.\" A library function or fuse internal may call statfs for a fuse branch. -.\" The create=mfs mode in aufs will surely call statfs for each writable -.\" branches. -.\" .Bu -.\" FUSE in kernel\-space converts and redirects the statfs request to the -.\" user\-space. -.\" .Bu -.\" the user\-space statfs handler will call [f]statvfs(3). -.\" .Bu -.\" the [f]statvfs(3) in glibc will access /proc/mounts and issue -.\" stat(2) for the mountpoint. But those require a read\-lock for the aufs -.\" root directory. -.\" .Bu -.\" Then a deadlock occurs. -.\" .\" .RE 1 -.\" .\" .IN -.\" -.\" In order to avoid this deadlock, I would suggest not to call -.\" [f]statvfs(3) from fuse. Here is a sample code to do this. -.\" .nf -.\" struct statvfs stvfs; -.\" -.\" main() -.\" { -.\" statvfs(..., &stvfs) -.\" or -.\" fstatvfs(..., &stvfs) -.\" stvfs.f_fsid = 0 -.\" } -.\" -.\" statfs_handler(const char *path, struct statvfs *arg) -.\" { -.\" struct statfs stfs -.\" -.\" memcpy(arg, &stvfs, sizeof(stvfs)) -.\" -.\" statfs(..., &stfs) -.\" or -.\" fstatfs(..., &stfs) -.\" -.\" arg->f_bfree = stfs.f_bfree -.\" arg->f_bavail = stfs.f_bavail -.\" arg->f_ffree = stfs.f_ffree -.\" arg->f_favail = /* any value */ -.\" } -.\" .fi - -.\" ---------------------------------------------------------------------- -.SH External Inode Number Bitmap, Translation Table and Generation Table (xino) -Aufs uses one external bitmap file and one external inode number -translation table files per an aufs and per a branch -filesystem by default. -Additionally when CONFIG_AUFS_EXPORT is enabled, one external inode -generation table is added. -The bitmap (and the generation table) is for recycling aufs inode number -and the others -are a table for converting an inode number on a branch to -an aufs inode number. The default path -is `first writable branch'/\*[AUFS_XINO_FNAME]. -If there is no writable branch, the -default path -will be \*[AUFS_XINO_DEFPATH]. -.\" A user who executes mount(8) needs the privilege to create xino -.\" file. - -If you enable CONFIG_SYSFS, the path of xino files are not shown in -/proc/mounts (and /etc/mtab), instead it is shown in -<sysfs>/fs/aufs/si_<id>/xi_path. -Otherwise, it is shown in /proc/mounts unless it is not the default -path. - -Those files are always opened and read/write by aufs frequently. -If your writable branch is on flash memory device, it is recommended -to put xino files on other than flash memory by specifying `xino=' -mount option. - -The -maximum file size of the bitmap is, basically, the amount of the -number of all the files on all branches divided by 8 (the number of -bits in a byte). -For example, on a 4KB page size system, if you have 32,768 (or -2,599,968) files in aufs world, -then the maximum file size of the bitmap is 4KB (or 320KB). - -The -maximum file size of the table will -be `max inode number on the branch x size of an inode number'. -For example in 32bit environment, - -.nf -$ df -i /branch_fs -/dev/hda14 2599968 203127 2396841 8% /branch_fs -.fi - -and /branch_fs is an branch of the aufs. When the inode number is -assigned contiguously (without `hole'), the maximum xino file size for -/branch_fs will be 2,599,968 x 4 bytes = about 10 MB. But it might not be -allocated all of disk blocks. -When the inode number is assigned discontinuously, the maximum size of -xino file will be the largest inode number on a branch x 4 bytes. -Additionally, the file size is limited to LLONG_MAX or the s_maxbytes -in filesystem's superblock (s_maxbytes may be smaller than -LLONG_MAX). So the -support-able largest inode number on a branch is less than -2305843009213693950 (LLONG_MAX/4\-1). -This is the current limitation of aufs. -On 64bit environment, this limitation becomes more strict and the -supported largest inode number is less than LLONG_MAX/8\-1. - -The xino files are always hidden, i.e. removed. So you cannot -do `ls \-l xino_file'. -If you enable CONFIG_DEBUG_FS, you can check these information through -<debugfs>/aufs/<si_id>/{xib,xi[0-9]*,xigen}. xib is for the bitmap file, -xi0 ix for the first branch, and xi1 is for the next. xigen is for the -generation table. -xib and xigen are in the format of, - -.nf -<blocks>x<block size> <file size> -.fi - -Note that a filesystem usually has a -feature called pre-allocation, which means a number of -blocks are allocated automatically, and then deallocated -silently when the filesystem thinks they are unnecessary. -You do not have to be surprised the sudden changes of the number of -blocks, when your filesystem which xino files are placed supports the -pre-allocation feature. - -The rests are hidden xino file information in the format of, - -.nf -<file count>, <blocks>x<block size> <file size> -.fi - -If the file count is larger than 1, it means some of your branches are -on the same filesystem and the xino file is shared by them. -Note that the file size may not be equal to the actual consuming blocks -since xino file is a sparse file, i.e. a hole in a file which does not -consume any disk blocks. - -Once you unmount aufs, the xino files for that aufs are totally gone. -It means that the inode number is not permanent across umount or -shutdown. - -The xino files should be created on the filesystem except NFS. -If your first writable branch is NFS, you will need to specify xino -file path other than NFS. -Also if you are going to remove the branch where xino files exist or -change the branch permission to readonly, you need to use xino option -before del/mod the branch. - -The bitmap file can be truncated. -For example, if you delete a branch which has huge number of files, -many inode numbers will be recycled and the bitmap will be truncated -to smaller size. Aufs does this automatically when a branch is -deleted. -You can truncate it anytime you like if you specify `trunc_xib' mount -option. But when the accessed inode number was not deleted, nothing -will be truncated. -If you do not want to truncate it (it may be slow) when you delete a -branch, specify `notrunc_xib' after `del' mount option. - -If you do not want to use xino, use noxino mount option. Use this -option with care, since the inode number may be changed silently and -unexpectedly anytime. -For example, -rmdir failure, recursive chmod/chown/etc to a large and deep directory -or anything else. -And some applications will not work correctly. -.\" When the inode number has been changed, your system -.\" can be crazy. -If you want to change the xino default path, use xino mount option. - -After you add branches, the persistence of inode number may not be -guaranteed. -At remount time, cached but unused inodes are discarded. -And the newly appeared inode may have different inode number at the -next access time. The inodes in use have the persistent inode number. - -When aufs assigned an inode number to a file, and if you create the -same named file on the upper branch directly, then the next time you -access the file, aufs may assign another inode number to the file even -if you use xino option. -Some applications may treat the file whose inode number has been -changed as totally different file. - -.\" ---------------------------------------------------------------------- -.SH Pseudo Link (hardlink over branches) -Aufs supports `pseudo link' which is a logical hard-link over -branches (cf. ln(1) and link(2)). -In other words, a copied-up file by link(2) and a copied-up file which was -hard-linked on a readonly branch filesystem. - -When you have files named fileA and fileB which are -hardlinked on a readonly branch, if you write something into fileA, -aufs copies-up fileA to a writable branch, and write(2) the originally -requested thing to the copied-up fileA. On the writable branch, -fileA is not hardlinked. -But aufs remembers it was hardlinked, and handles fileB as if it existed -on the writable branch, by referencing fileA's inode on the writable -branch as fileB's inode. - -Once you unmount aufs, the plink info for that aufs kept in memory are totally -gone. -It means that the pseudo-link is not permanent. -If you want to make plink permanent, try `auplink' utility just before -one of these operations, -unmounting your aufs, -using `ro' or `noplink' mount option, -deleting a branch from aufs, -adding a branch into aufs, -or changing your writable branch to readonly. - -This utility will reproduces all real hardlinks on a writable branch by linking -them, and removes pseudo-link info in memory and temporary link on the -writable branch. -Since this utility access your branches directly, you cannot hide them by -`mount \-\-bind /tmp /branch' or something. - -If you are willing to rebuild your aufs with the same branches later, you -should use auplink utility before you umount your aufs. -If you installed both of /sbin/mount.aufs and /sbin/umount.aufs, and your -mount(8) and umount(8) support them, -`auplink' utility will be executed automatically and flush pseudo-links. - -.nf -# auplink /your/aufs/root flush -# umount /your/aufs/root -or -# auplink /your/aufs/root flush -# mount -o remount,mod:/your/writable/branch=ro /your/aufs/root -or -# auplink /your/aufs/root flush -# mount -o remount,noplink /your/aufs/root -or -# auplink /your/aufs/root flush -# mount -o remount,del:/your/aufs/branch /your/aufs/root -or -# auplink /your/aufs/root flush -# mount -o remount,append:/your/aufs/branch /your/aufs/root -.fi - -The plinks are kept both in memory and on disk. When they consumes too much -resources on your system, you can use the `auplink' utility at anytime and -throw away the unnecessary pseudo-links in safe. - -Additionally, the `auplink' utility is very useful for some security reasons. -For example, when you have a directory whose permission flags -are 0700, and a file who is 0644 under the 0700 directory. Usually, -all files under the 0700 directory are private and no one else can see -the file. But when the directory is 0711 and someone else knows the 0644 -filename, he can read the file. - -Basically, aufs pseudo-link feature creates a temporary link under the -directory whose owner is root and the permission flags are 0700. -But when the writable branch is NFS, aufs sets 0711 to the directory. -When the 0644 file is pseudo-linked, the temporary link, of course the -contents of the file is totally equivalent, will be created under the -0711 directory. The filename will be generated by its inode number. -While it is hard to know the generated filename, someone else may try peeping -the temporary pseudo-linked file by his software tool which may try the name -from one to MAX_INT or something. -In this case, the 0644 file will be read unexpectedly. -I am afraid that leaving the temporary pseudo-links can be a security hole. -It makes sense to execute `auplink /your/aufs/root flush' -periodically, when your writable branch is NFS. - -When your writable branch is not NFS, or all users are careful enough to set 0600 -to their private files, you do not have to worry about this issue. - -If you do not want this feature, use `noplink' mount option. - -.SS The behaviours of plink and noplink -This sample shows that the `f_src_linked2' with `noplink' option cannot follow -the link. - -.nf -none on /dev/shm/u type aufs (rw,xino=/dev/shm/rw/.aufs.xino,br:/dev/shm/rw=rw:/dev/shm/ro=ro) -$ ls -li ../r?/f_src_linked* ./f_src_linked* ./copied -ls: ./copied: No such file or directory -15 -rw-r--r-- 2 jro jro 2 Dec 22 11:03 ../ro/f_src_linked -15 -rw-r--r-- 2 jro jro 2 Dec 22 11:03 ../ro/f_src_linked2 -22 -rw-r--r-- 2 jro jro 2 Dec 22 11:03 ./f_src_linked -22 -rw-r--r-- 2 jro jro 2 Dec 22 11:03 ./f_src_linked2 -$ echo abc >> f_src_linked -$ cp f_src_linked copied -$ ls -li ../r?/f_src_linked* ./f_src_linked* ./copied -15 -rw-r--r-- 2 jro jro 2 Dec 22 11:03 ../ro/f_src_linked -15 -rw-r--r-- 2 jro jro 2 Dec 22 11:03 ../ro/f_src_linked2 -36 -rw-r--r-- 2 jro jro 6 Dec 22 11:03 ../rw/f_src_linked -53 -rw-r--r-- 1 jro jro 6 Dec 22 11:03 ./copied -22 -rw-r--r-- 2 jro jro 6 Dec 22 11:03 ./f_src_linked -22 -rw-r--r-- 2 jro jro 6 Dec 22 11:03 ./f_src_linked2 -$ cmp copied f_src_linked2 -$ - -none on /dev/shm/u type aufs (rw,xino=/dev/shm/rw/.aufs.xino,noplink,br:/dev/shm/rw=rw:/dev/shm/ro=ro) -$ ls -li ../r?/f_src_linked* ./f_src_linked* ./copied -ls: ./copied: No such file or directory -17 -rw-r--r-- 2 jro jro 2 Dec 22 11:03 ../ro/f_src_linked -17 -rw-r--r-- 2 jro jro 2 Dec 22 11:03 ../ro/f_src_linked2 -23 -rw-r--r-- 2 jro jro 2 Dec 22 11:03 ./f_src_linked -23 -rw-r--r-- 2 jro jro 2 Dec 22 11:03 ./f_src_linked2 -$ echo abc >> f_src_linked -$ cp f_src_linked copied -$ ls -li ../r?/f_src_linked* ./f_src_linked* ./copied -17 -rw-r--r-- 2 jro jro 2 Dec 22 11:03 ../ro/f_src_linked -17 -rw-r--r-- 2 jro jro 2 Dec 22 11:03 ../ro/f_src_linked2 -36 -rw-r--r-- 1 jro jro 6 Dec 22 11:03 ../rw/f_src_linked -53 -rw-r--r-- 1 jro jro 6 Dec 22 11:03 ./copied -23 -rw-r--r-- 2 jro jro 6 Dec 22 11:03 ./f_src_linked -23 -rw-r--r-- 2 jro jro 6 Dec 22 11:03 ./f_src_linked2 -$ cmp copied f_src_linked2 -cmp: EOF on f_src_linked2 -$ -.fi - -.\" -.\" If you add/del a branch, or link/unlink the pseudo-linked -.\" file on a branch -.\" directly, aufs cannot keep the correct link count, but the status of -.\" `pseudo-linked.' -.\" Those files may or may not keep the file data after you unlink the -.\" file on the branch directly, especially the case of your branch is -.\" NFS. - -If you add a branch which has fileA or fileB, aufs does not follow the -pseudo link. The file on the added branch has no relation to the same -named file(s) on the lower branch(es). -If you use noxino mount option, pseudo link will not work after the -kernel shrinks the inode cache. - -This feature will not work for squashfs before version 3.2 since its -inode is tricky. -When the inode is hardlinked, squashfs inodes has the same inode -number and correct link count, but the inode memory object is -different. Squashfs inodes (before v3.2) are generated for each, even -they are hardlinked. - -.\" ---------------------------------------------------------------------- -.SH User's Direct Branch Access (UDBA) -UDBA means a modification to a branch filesystem manually or directly, -e.g. bypassing aufs. -While aufs is designed and implemented to be safe after UDBA, -it can make yourself and your aufs confused. And some information like -aufs inode will be incorrect. -For example, if you rename a file on a branch directly, the file on -aufs may -or may not be accessible through both of old and new name. -Because aufs caches various information about the files on -branches. And the cache still remains after UDBA. - -Aufs has a mount option named `udba' which specifies the test level at -access time whether UDBA was happened or not. -. -.TP -.B udba=none -Aufs trusts the dentry and the inode cache on the system, and never -test about UDBA. With this option, aufs runs fastest, but it may show -you incorrect data. -Additionally, if you often modify a branch -directly, aufs will not be able to trace the changes of inodes on the -branch. It can be a cause of wrong behaviour, deadlock or anything else. - -It is recommended to use this option only when you are sure that -nobody access a file on a branch. -It might be difficult for you to achieve real `no UDBA' world when you -cannot stop your users doing `find / \-ls' or something. -If you really want to forbid all of your users to UDBA, here is a trick -for it. -With this trick, users cannot see the -branches directly and aufs runs with no problem, except `auplink' utility. -But if you are not familiar with aufs, this trick may make -yourself confused. - -.nf -# d=/tmp/.aufs.hide -# mkdir $d -# for i in $branches_you_want_to_hide -> do -> mount -n --bind $d $i -> done -.fi - -When you unmount the aufs, delete/modify the branch by remount, or you -want to show the hidden branches again, unmount the bound -/tmp/.aufs.hide. - -.nf -# umount -n $branches_you_want_to_unbound -.fi - -If you use FUSE filesystem as an aufs branch which supports hardlink, -you should not set this option, since FUSE makes inode objects for -each hardlinks (at least in linux\-2.6.23). When your FUSE filesystem -maintains them at link/unlinking, it is equivalent -to `direct branch access' for aufs. - -. -.TP -.B udba=reval -Aufs tests only the existence of the file which existed. If -the existed file was removed on the branch directly, aufs -discard the cache about the file and -re-lookup it. So the data will be updated. -This test is at minimum level to keep the performance and ensure the -existence of a file. -This is default and aufs runs still fast. - -This rule leads to some unexpected situation, but I hope it is -harmless. Those are totally depends upon cache. Here are just a few -examples. -. -.RS -.Bu -If the file is cached as negative or -not-existed, aufs does not test it. And the file is still handled as -negative after a user created the file on a branch directly. If the -file is not cached, aufs will lookup normally and find the file. -. -.Bu -When the file is cached as positive or existed, and a user created the -same named file directly on the upper branch. Aufs detects the cached -inode of the file is still existing and will show you the old (cached) -file which is on the lower branch. -. -.Bu -When the file is cached as positive or existed, and a user renamed the -file by rename(2) directly. Aufs detects the inode of the file is -still existing. You may or may not see both of the old and new files. -Todo: If aufs also tests the name, we can detect this case. -.RE - -If your outer modification (UDBA) is rare and you can ignore the -temporary and minor differences between virtual aufs world and real -branch filesystem, then try this mount option. -. -.TP -.B udba=inotify -Aufs sets `inotify' to all the accessed directories on its branches -and receives the event about the dir and its children. It consumes -resources, cpu and memory. And I am afraid that the performance will be -hurt, but it is most strict test level. -There are some limitations of linux inotify, see also Inotify -Limitation. -So it is recommended to leave udba default option usually, and set it -to inotify by remount when you need it. - -When a user accesses the file which was notified UDBA before, the cached data -about the file will be discarded and aufs re-lookup it. So the data will -be updated. -When an error condition occurs between UDBA and aufs operation, aufs -will return an error, including EIO. -To use this option, you need to enable CONFIG_INOTIFY and -CONFIG_AUFS_UDBA_INOTIFY. - -To rename/rmdir a directory on a branch directory may reveal the same named -directory on the lower branch. Aufs tries re-lookuping the renamed -directory and the revealed directory and assigning different inode -number to them. But the inode number including their children can be a -problem. The inode numbers will be changed silently, and -aufs may produce a warning. If you rename a directory repeatedly and -reveal/hide the lower directory, then aufs may confuse their inode -numbers too. It depends upon the system cache. - -When you make a directory in aufs and mount other filesystem on it, -the directory in aufs cannot be removed expectedly because it is a -mount point. But the same named directory on the writable branch can -be removed, if someone wants. It is just an empty directory, instead -of a mount point. -Aufs cannot stop such direct rmdir, but produces a warning about it. - -If the pseudo-linked file is hardlinked or unlinked on the branch -directly, its inode link count in aufs may be incorrect. It is -recommended to flush the pseudo-links by auplink script. - -.\" ---------------------------------------------------------------------- -.SH Linux Inotify Limitation -Unfortunately, current inotify (linux\-2.6.18) has some limitations, -and aufs must derive it. - -.SS IN_ATTRIB, updating atime -When a file/dir on a branch is accessed directly, the inode atime (access -time, cf. stat(2)) may or may not be updated. In some cases, inotify -does not fire this event. So the aufs inode atime may remain old. - -.SS IN_ATTRIB, updating nlink -When the link count of a file on a branch is incremented by link(2) -directly, -inotify fires IN_CREATE to the parent -directory, but IN_ATTRIB to the file. So the aufs inode nlink may -remain old. - -.SS IN_DELETE, removing file on NFS -When a file on a NFS branch is deleted directly, inotify may or may -not fire -IN_DELETE event. It depends upon the status of dentry -(DCACHE_NFSFS_RENAMED flag). -In this case, the file on aufs seems still exists. Aufs and any user can see -the file. - -.SS IN_IGNORED, deleted rename target -When a file/dir on a branch is unlinked by rename(2) directly, inotify -fires IN_IGNORED which means the inode is deleted. Actually, in some -cases, the inode survives. For example, the rename target is linked or -opened. In this case, inotify watch set by aufs is removed by VFS and -inotify. -And aufs cannot receive the events anymore. So aufs may show you -incorrect data about the file/dir. - -.\" ---------------------------------------------------------------------- -.SH Virtual or Vertical Directory Block (VDIR) -In order to provide the merged view of file listing, aufs builds -internal directory block on memory. For readdir, aufs performs readdir() -internally for each dir on branches, merges their entries with -eliminating the whiteout\-ed ones, and sets it to the opened file (dir) -object. So the file object has its entry list until it is closed. The -entry list will be updated when the file position is zero (by -rewinddir(3)) and becomes obsoleted. - -Some people may call it can be a security hole or invite DoS attack -since the opened and once readdir\-ed dir (file object) holds its entry -list and becomes a pressure for system memory. But I would say it is similar -to files under /proc or /sys. The virtual files in them also holds a -memory page (generally) while they are opened. When an idea to reduce -memory for them is introduced, it will be applied to aufs too. - -The dynamically allocated memory block for the name of entries has a -unit of \*[AUFS_RDBLK_DEF] bytes by default. -During building dir blocks, aufs creates hash list (hashed and divided by -\*[AUFS_RDHASH_DEF] by default) and judging whether -the entry is whiteouted by its upper branch or already listed. - -These values are suitable for normal environments. But you may have -millions of files or very long filenames under a single directory. For -such cases, you may need to customize these values by specifying rdblk= -and rdhash= aufs mount options. - -For instance, there are 97 files under my /bin, and the total name -length is 597 bytes. - -.nf -$ \\ls -1 /bin | wc - 97 97 597 -.fi - -Strictly speaking, 97 end\-of\-line codes are -included. But it is OK since aufs VDIR also stores the name length in 1 -byte. In this case, you do not need to customize the default values. 597 bytes -filenames will be stored in 2 VDIR memory blocks (597 < -\*[AUFS_RDBLK_DEF] x 2). -And 97 filenames are distributed among \*[AUFS_RDHASH_DEF] lists, so one -list will point 4 names in average. To judge the names is whiteouted or -not, the number of comparison will be 4. 2 memory allocations -and 4 comparison costs low (even if the directory is opened for a long -time). So you do not need to customize. - -If your directory has millions of files, the you will need to specify -rdblk= and rdhash=. - -.nf -$ ls -U /mnt/rotating-rust | wc -l -1382438 -.fi - -In this case, assuming the average length of filenames is 6, in order to -get better time performance I would -recommend to set $((128*1024)) or $((64*1024)) for rdblk, and -$((8*1024)) or $((4*1024)) for rdhash. -You can change these values of the active aufs mount by "mount -o -remount". - -This customization is not for -reducing the memory space, but for reducing time for the number of memory -allocation and the name comparison. The larger value is faster, in -general. Of course, you will need system memory. This is a generic -"time\-vs\-space" problem. - -.\" ---------------------------------------------------------------------- -.SH Copy On Write, or aufs internal copyup and copydown -Every stackable filesystem which implements copy\-on\-write supports the -copyup feature. The feature is to copy a file/dir from the lower branch -to the upper internally. When you have one readonly branch and one -upper writable branch, and you append a string to a file which exists on -the readonly branch, then aufs will copy the file from the readonly -branch to the writable branch with its directory hierarchy. It means one -write(2) involves several logical/internal mkdir(2), creat(2), read(2), -write(2) and close(2) systemcalls -before the actual expected write(2) is performed. Sometimes it may take -a long time, particularly when the file is very large. -If CONFIG_AUFS_DEBUG is enabled, aufs produces a message saying `copying -a large file.' - -You may see the message when you change the xino file path or -truncate the xino/xib files. Sometimes those files can be large and may -take a long time to handle them. - -.\" ---------------------------------------------------------------------- -.SH Policies to Select One among Multiple Writable Branches -Aufs has some policies to select one among multiple writable branches -when you are going to write/modify something. There are two kinds of -policies, one is for newly create something and the other is for -internal copy-up. -You can select them by specifying mount option `create=CREATE_POLICY' -or `cpup=COPYUP_POLICY.' -These policies have no meaning when you have only one writable -branch. If there is some meaning, it must hurt the performance. - -.SS Exceptions for Policies -In every cases below, even if the policy says that the branch where a -new file should be created is /rw2, the file will be created on /rw1. -. -.Bu -If there is a readonly branch with `wh' attribute above the -policy-selected branch and the parent dir is marked as opaque, -or the target (creating) file is whiteouted on the ro+wh branch, then -the policy will be ignored and the target file will be created on the -nearest upper writable branch than the ro+wh branch. -.RS -.nf -/aufs = /rw1 + /ro+wh/diropq + /rw2 -/aufs = /rw1 + /ro+wh/wh.tgt + /rw2 -.fi -.RE -. -.Bu -If there is a writable branch above the policy-selected branch and the -parent dir is marked as opaque or the target file is whiteouted on the -branch, then the policy will be ignored and the target file will be -created on the highest one among the upper writable branches who has -diropq or whiteout. In case of whiteout, aufs removes it as usual. -.RS -.nf -/aufs = /rw1/diropq + /rw2 -/aufs = /rw1/wh.tgt + /rw2 -.fi -.RE -. -.Bu -link(2) and rename(2) systemcalls are exceptions in every policy. -They try selecting the branch where the source exists as possible since -copyup a large file will take long time. If it can't be, ie. the -branch where the source exists is readonly, then they will follow the -copyup policy. -. -.Bu -There is an exception for rename(2) when the target exists. -If the rename target exists, aufs compares the index of the branches -where the source and the target are existing and selects the higher -one. If the selected branch is readonly, then aufs follows the copyup -policy. - -.SS Policies for Creating -. -.TP -.B create=tdp | top\-down\-parent -Selects the highest writable branch where the parent dir exists. If -the parent dir does not exist on a writable branch, then the internal -copyup will happen. The policy for this copyup is always `bottom-up.' -This is the default policy. -. -.TP -.B create=rr | round\-robin -Selects a writable branch in round robin. When you have two writable -branches and creates 10 new files, 5 files will be created for each -branch. -mkdir(2) systemcall is an exception. When you create 10 new directories, -all are created on the same branch. -. -.TP -.B create=mfs[:second] | most\-free\-space[:second] -Selects a writable branch which has most free space. In order to keep -the performance, you can specify the duration (`second') which makes -aufs hold the index of last selected writable branch until the -specified seconds expires. The first time you create something in aufs -after the specified seconds expired, aufs checks the amount of free -space of all writable branches by internal statfs call -and the held branch index will be updated. -The default value is \*[AUFS_MFS_SECOND_DEF] seconds. -. -.TP -.B create=mfsrr:low[:second] -Selects a writable branch in most-free-space mode first, and then -round-robin mode. If the selected branch has less free space than the -specified value `low' in bytes, then aufs re-tries in round-robin mode. -.\" `G', `M' and `K' (case insensitive) can be followed after `low.' Or -Try an arithmetic expansion of shell which is defined by POSIX. -For example, $((10 * 1024 * 1024)) for 10M. -You can also specify the duration (`second') which is equivalent to -the `mfs' mode. -. -.TP -.B create=pmfs[:second] -Selects a writable branch where the parent dir exists, such as tdp -mode. When the parent dir exists on multiple writable branches, aufs -selects the one which has most free space, such as mfs mode. - -.SS Policies for Copy-Up -. -.TP -.B cpup=tdp | top\-down\-parent -Equivalent to the same named policy for create. -This is the default policy. -. -.TP -.B cpup=bup | bottom\-up\-parent -Selects the writable branch where the parent dir exists and the branch -is nearest upper one from the copyup-source. -. -.TP -.B cpup=bu | bottom\-up -Selects the nearest upper writable branch from the copyup-source, -regardless the existence of the parent dir. - -.\" ---------------------------------------------------------------------- -.SH Exporting Aufs via NFS -Aufs is supporting NFS-exporting. -Since aufs has no actual block device, you need to add NFS `fsid' option at -exporting. Refer to the manual of NFS about the detail of this option. - -There are some limitations or requirements. -.RS -.Bu -The branch filesystem must support NFS-exporting. -.Bu -NFSv2 is not supported. When you mount the exported aufs from your NFS -client, you will need to some NFS options like v3 or nfsvers=3, -especially if it is nfsroot. -.Bu -If the size of the NFS file handle on your branch filesystem is large, -aufs will -not be able to handle it. The maximum size of NFSv3 file -handle for a filesystem is 64 bytes. Aufs uses 24 bytes for 32bit -system, plus 12 bytes for 64bit system. The rest is a room for a file -handle of a branch filesystem. -.Bu -The External Inode Number Bitmap, Translation Table and Generation Table -(xino) is -required since NFS file -handle is based upon inode number. The mount option `xino' is enabled -by default. -The external inode generation table and its debugfs entry -(<debugfs>/aufs/si_*/xigen) is created when CONFIG_AUFS_EXPORT is -enabled even if you don't export aufs actually. -The size of the external inode generation table grows only, never be -truncated. You might need to pay attention to the free space of the -filesystem where xino files are placed. By default, it is the first -writable branch. -.Bu -The branch filesystems must be accessible, which means `not hidden.' -It means you need to `mount \-\-move' when you use initramfs and -switch_root(8), or chroot(8). -.RE - -.\" ---------------------------------------------------------------------- -.SH Dentry and Inode Caches -If you want to clear caches on your system, there are several tricks -for that. If your system ram is low, -try `find /large/dir \-ls > /dev/null'. -It will read many inodes and dentries and cache them. Then old caches will be -discarded. -But when you have large ram or you do not have such large -directory, it is not effective. - -If you want to discard cache within a certain filesystem, -try `mount \-o remount /your/mntpnt'. Some filesystem may return an error of -EINVAL or something, but VFS discards the unused dentry/inode caches on the -specified filesystem. - -.\" ---------------------------------------------------------------------- -.SH Compatible/Incompatible with Unionfs Version 1.x Series -If you compile aufs with \-DCONFIG_AUFS_COMPAT, dirs= option and =nfsro -branch permission flag are available. They are interpreted as -br: option and =ro flags respectively. - `debug', `delete', `imap' options are ignored silently. When you -compile aufs without \-DCONFIG_AUFS_COMPAT, these three options are -also ignored, but a warning message is issued. - -Ignoring `delete' option, and to keep filesystem consistency, aufs tries -writing something to only one branch in a single systemcall. It means -aufs may copyup even if the copyup-src branch is specified as writable. -For example, you have two writable branches and a large regular file -on the lower writable branch. When you issue rename(2) to the file on aufs, -aufs may copyup it to the upper writable branch. -If this behaviour is not what you want, then you should rename(2) it -on the lower branch directly. - -And there is a simple shell -script `unionctl' under sample subdirectory, which is compatible with -unionctl(8) in -Unionfs Version 1.x series, except \-\-query action. -This script executes mount(8) with `remount' option and uses -add/del/mod aufs mount options. -If you are familiar with Unionfs Version 1.x series and want to use unionctl(8), you can -try this script instead of using mount \-o remount,... directly. -Aufs does not support ioctl(2) interface. -This script is highly depending upon mount(8) in -util\-linux\-2.12p package, and you need to mount /proc to use this script. -If your mount(8) version differs, you can try modifying this -script. It is very easy. -The unionctl script is just for a sample usage of aufs remount -interface. - -Aufs uses the external inode number bitmap and translation table by -default. - -The default branch permission for the first branch is `rw', and the -rest is `ro.' - -The whiteout is for hiding files on lower branches. Also it is applied -to stop readdir going lower branches. -The latter case is called `opaque directory.' Any -whiteout is an empty file, it means whiteout is just an mark. -In the case of hiding lower files, the name of whiteout is -`\*[AUFS_WH_PFX]<filename>.' -And in the case of stopping readdir, the name is -`\*[AUFS_WH_PFX]\*[AUFS_WH_PFX].opq' or -`\*[AUFS_WH_PFX]__dir_opaque.' The name depends upon your compile -configuration -CONFIG_AUFS_COMPAT. -.\" All of newly created or renamed directory will be opaque. -All whiteouts are hardlinked, -including `<writable branch top dir>/\*[AUFS_WH_BASE].' - -The hardlink on an ordinary (disk based) filesystem does not -consume inode resource newly. But in linux tmpfs, the number of free -inodes will be decremented by link(2). It is recommended to specify -nr_inodes option to your tmpfs if you meet ENOSPC. Use this option -after checking by `df \-i.' - -When you rmdir or rename-to the dir who has a number of whiteouts, -aufs rename the dir to the temporary whiteouted-name like -`\*[AUFS_WH_PFX]<dir>.<random hex>.' Then remove it after actual operation. -cf. mount option `dirwh.' - -.\" ---------------------------------------------------------------------- -.SH Incompatible with an Ordinary Filesystem -stat(2) returns the inode info from the first existence inode among -the branches, except the directory link count. -Aufs computes the directory link count larger than the exact value usually, in -order to keep UNIX filesystem semantics, or in order to shut find(1) mouth up. -The size of a directory may be wrong too, but it has to do no harm. -The timestamp of a directory will not be updated when a file is -created or removed under it, and it was done on a lower branch. - -The test for permission bits has two cases. One is for a directory, -and the other is for a non-directory. In the case of a directory, aufs -checks the permission bits of all existing directories. It means you -need the correct privilege for the directories including the lower -branches. -The test for a non-directory is more simple. It checks only the -topmost inode. - -statfs(2) returns the information of the first branch info except -namelen when `nosum' is specified (the default). The namelen is -decreased by the whiteout prefix length. And the block size may differ -from st_blksize which is obtained by stat(2). - -Remember, seekdir(3) and telldir(3) are not defined in POSIX. They may -not work as you expect. Try rewinddir(3) or re-open the dir. - -The whiteout prefix (\*[AUFS_WH_PFX]) is reserved on all branches. Users should -not handle the filename begins with this prefix. -In order to future whiteout, the maximum filename length is limited by -the longest value \- \*[AUFS_WH_PFX_LEN]. It may be a violation of POSIX. - -If you dislike the difference between the aufs entries in /etc/mtab -and /proc/mounts, and if you are using mount(8) in util\-linux package, -then try ./mount.aufs utility. Copy the script to /sbin/mount.aufs. -This simple utility tries updating -/etc/mtab. If you do not care about /etc/mtab, you can ignore this -utility. -Remember this utility is highly depending upon mount(8) in -util\-linux\-2.12p package, and you need to mount /proc. - -Since aufs uses its own inode and dentry, your system may cache huge -number of inodes and dentries. It can be as twice as all of the files -in your union. -It means that unmounting or remounting readonly at shutdown time may -take a long time, since mount(2) in VFS tries freeing all of the cache -on the target filesystem. - -When you open a directory, aufs will open several directories -internally. -It means you may reach the limit of the number of file descriptor. -And when the lower directory cannot be opened, aufs will close all the -opened upper directories and return an error. - -The sub-mount under the branch -of local filesystem -is ignored. -For example, if you have mount another filesystem on -/branch/another/mntpnt, the files under `mntpnt' will be ignored by aufs. -It is recommended to mount the sub-mount under the mounted aufs. -For example, - -.nf -# sudo mount /dev/sdaXX /ro_branch -# d=another/mntpnt -# sudo mount /dev/sdbXX /ro_branch/$d -# mkdir -p /rw_branch/$d -# sudo mount -t aufs -o br:/rw_branch:/ro_branch none /aufs -# sudo mount -t aufs -o br:/rw_branch/${d}:/ro_branch/${d} none /aufs/another/$d -.fi - -There are several characters which are not allowed to use in a branch -directory path and xino filename. See detail in Branch Syntax and Mount -Option. - -The file-lock which means fcntl(2) with F_SETLK, F_SETLKW or F_GETLK, flock(2) -and lockf(3), is applied to virtual aufs file only, not to the file on a -branch. It means you can break the lock by accessing a branch directly. -TODO: check `security' to hook locks, as inotify does. - -The I/O to the named pipe or local socket are not handled by aufs, even -if it exists in aufs. After the reader and the writer established their -connection if the pipe/socket are copied-up, they keep using the old one -instead of the copied-up one. - -The fsync(2) and fdatasync(2) systemcalls return 0 which means success, even -if the given file descriptor is not opened for writing. -I am afraid this behaviour may violate some standards. Checking the -behaviour of fsync(2) on ext2, aufs decided to return success. - -If you want to use disk-quota, you should set it up to your writable -branch since aufs does not have its own block device. - -When your aufs is the root directory of your system, and your system -tells you some of the filesystem were not unmounted cleanly, try these -procedure when you shutdown your system. -.nf -# mount -no remount,ro / -# for i in $writable_branches -# do mount -no remount,ro $i -# done -.fi -If your xino file is on a hard drive, you also need to specify -`noxino' option or `xino=/your/tmpfs/xino' at remounting root -directory. - -To rename(2) directory may return EXDEV even if both of src and tgt -are on the same aufs. When the rename-src dir exists on multiple -branches and the lower dir has child(ren), aufs has to copyup all his -children. It can be recursive copyup. Current aufs does not support -such huge copyup operation at one time in kernel space, instead -produces a warning and returns EXDEV. -Generally, mv(1) detects this error and tries mkdir(2) and -rename(2) or copy/unlink recursively. So the result is harmless. -If your application which issues rename(2) for a directory does not -support EXDEV, it will not work on aufs. -Also this specification is applied to the case when the src directory -exists on the lower readonly branch and it has child(ren). - -If a sudden accident such like a power failure happens during aufs is -performing, and regular fsck for branch filesystems is completed after -the disaster, you need to extra fsck for aufs writable branches. It is -necessary to check whether the whiteout remains incorrectly or not, -eg. the real filename and the whiteout for it under the same parent -directory. If such whiteout remains, aufs cannot handle the file -correctly. -To check the consistency from the aufs' point of view, you can use a -simple shell script called /sbin/auchk. Its purpose is a fsck tool for -aufs, and it checks the illegal whiteout, the remained -pseudo-links and the remained aufs-temp files. If they are found, the -utility reports you and asks whether to delete or not. -It is recommended to execute /sbin/auchk for every writable branch -filesystem before mounting aufs if the system experienced crash. - - -.\" ---------------------------------------------------------------------- -.SH EXAMPLES -The mount options are interpreted from left to right at remount-time. -These examples -shows how the options are handled. (assuming /sbin/mount.aufs was -installed) - -.nf -# mount -v -t aufs br:/day0:/base none /u -none on /u type aufs (rw,xino=/day0/.aufs.xino,br:/day0=rw:/base=ro) -# mount -v -o remount,\\ - prepend:/day1,\\ - xino=/day1/xino,\\ - mod:/day0=ro,\\ - del:/day0 \\ - /u -none on /u type aufs (rw,xino=/day1/xino,br:/day1=rw:/base=ro) -.fi - -.nf -# mount -t aufs br:/rw none /u -# mount -o remount,append:/ro /u -different uid/gid/permission, /ro -# mount -o remount,del:/ro /u -# mount -o remount,nowarn_perm,append:/ro /u -# -(there is no warning) -.fi - -.\" If you want to expand your filesystem size, aufs may help you by -.\" adding an writable branch. Since aufs supports multiple writable -.\" branches, the old writable branch can be being writable, if you want. -.\" In this example, any modifications to the files under /ro branch will -.\" be copied-up to /new, but modifications to the files under /rw branch -.\" will not. -.\" And the next example shows the modifications to the files under /rw branch -.\" will be copied-up to /new/a. -.\" -.\" Todo: test multiple writable branches policy. cpup=nearest, cpup=exist_parent. -.\" -.\" .nf -.\" # mount -v -t aufs br:/rw:/ro none /u -.\" none on /u type aufs (rw,xino=/rw/.aufs.xino,br:/rw=rw:/ro=ro) -.\" # mkfs /new -.\" # mount -v -o remount,add:1:/new=rw /u -.\" none on /u type aufs (rw,xino=/rw/.aufs.xino,br:/rw=rw:/new=rw:/ro=ro) -.\" .fi -.\" -.\" .nf -.\" # mount -v -t aufs br:/rw:/ro none /u -.\" none on /u type aufs (rw,xino=/rw/.aufs.xino,br:/rw=rw:/ro=ro) -.\" # mkfs /new -.\" # mkdir /new/a new/b -.\" # mount -v -o remount,add:1:/new/b=rw,prepend:/new/a,mod:/rw=ro /u -.\" none on /u type aufs (rw,xino=/rw/.aufs.xino,br:/new/a=rw:/rw=ro:/new/b=rw:/ro=ro) -.\" .fi - -When you use aufs as root filesystem, it is recommended to consider to -exclude some directories. For example, /tmp and /var/log are not need -to stack in many cases. They do not usually need to copyup or to whiteout. -Also the swapfile on aufs (a regular file, not a block device) is not -supported. -In order to exclude the specific dir from aufs, try bind mounting. - -And there is a good sample which is for network booted diskless machines. See -sample/ in detail. - -.\" ---------------------------------------------------------------------- -.SH DIAGNOSTICS -When you add a branch to your union, aufs may warn you about the -privilege or security of the branch, which is the permission bits, -owner and group of the top directory of the branch. -For example, when your upper writable branch has a world writable top -directory, -a malicious user can create any files on the writable branch directly, -like copyup and modify manually. I am afraid it can be a security -issue. - -When you mount or remount your union without \-o ro common mount option -and without writable branch, aufs will warn you that the first branch -should be writable. - -.\" It is discouraged to set both of `udba' and `noxino' mount options. In -.\" this case the inode number under aufs will always be changed and may -.\" reach the end of inode number which is a maximum of unsigned long. If -.\" the inode number reaches the end, aufs will return EIO repeatedly. - -When you set udba other than inotify and change something on your -branch filesystem directly, later aufs may detect some mismatches to -its cache. If it is a critical mismatch, aufs returns EIO. - -When an error occurs in aufs, aufs prints the kernel message with -`errno.' The priority of the message (log level) is ERR or WARNING which -depends upon the message itself. -You can convert the `errno' into the error message by perror(3), -strerror(3) or something. -For example, the `errno' in the message `I/O Error, write failed (\-28)' -is 28 which means ENOSPC or `No space left on device.' - -When CONFIG_AUFS_BR_RAMFS is enabled, you can specify ramfs as an aufs -branch. Since ramfs is simple, it does not set the maximum link count -originally. In aufs, it is very dangerous, particularly for -whiteouts. Finally aufs sets the maximum link count for ramfs. The -value is 32000 which is borrowed from ext2. - - -.\" .SH Current Limitation -. -.\" ---------------------------------------------------------------------- -.\" SYNOPSIS -.\" briefly describes the command or function's interface. For commands, this -.\" shows the syntax of the command and its arguments (including options); bold- -.\" face is used for as-is text and italics are used to indicate replaceable -.\" arguments. Brackets ([]) surround optional arguments, vertical bars (|) sep- -.\" arate choices, and ellipses (...) can be repeated. For functions, it shows -.\" any required data declarations or #include directives, followed by the func- -.\" tion declaration. -. -.\" DESCRIPTION -.\" gives an explanation of what the command, function, or format does. Discuss -.\" how it interacts with files and standard input, and what it produces on -.\" standard output or standard error. Omit internals and implementation -.\" details unless they're critical for understanding the interface. Describe -.\" the usual case; for information on options use the OPTIONS section. If -.\" there is some kind of input grammar or complex set of subcommands, consider -.\" describing them in a separate USAGE section (and just place an overview in -.\" the DESCRIPTION section). -. -.\" RETURN VALUE -.\" gives a list of the values the library routine will return to the caller and -.\" the conditions that cause these values to be returned. -. -.\" EXIT STATUS -.\" lists the possible exit status values or a program and the conditions that -.\" cause these values to be returned. -. -.\" USAGE -.\" describes the grammar of any sublanguage this implements. -. -.\" FILES -.\" lists the files the program or function uses, such as configuration files, -.\" startup files, and files the program directly operates on. Give the full -.\" pathname of these files, and use the installation process to modify the -.\" directory part to match user preferences. For many programs, the default -.\" installation location is in /usr/local, so your base manual page should use -.\" /usr/local as the base. -. -.\" ENVIRONMENT -.\" lists all environment variables that affect your program or function and how -.\" they affect it. -. -.\" SECURITY -.\" discusses security issues and implications. Warn about configurations or -.\" environments that should be avoided, commands that may have security impli- -.\" cations, and so on, especially if they aren't obvious. Discussing security -.\" in a separate section isn't necessary; if it's easier to understand, place -.\" security information in the other sections (such as the DESCRIPTION or USAGE -.\" section). However, please include security information somewhere! -. -.\" CONFORMING TO -.\" describes any standards or conventions this implements. -. -.\" NOTES -.\" provides miscellaneous notes. -. -.\" BUGS -.\" lists limitations, known defects or inconveniences, and other questionable -.\" activities. - -.SH COPYRIGHT -Copyright \(co 2005\-2009 Junjiro R. Okajima - -.SH AUTHOR -Junjiro R. Okajima - -.\" SEE ALSO -.\" lists related man pages in alphabetical order, possibly followed by other -.\" related pages or documents. Conventionally this is the last section. diff --git a/package/aufs2-util/src/aufs.shlib b/package/aufs2-util/src/aufs.shlib deleted file mode 100644 index 7aa07665c..000000000 --- a/package/aufs2-util/src/aufs.shlib +++ /dev/null @@ -1,83 +0,0 @@ -# -# Copyright (C) 2005-2009 Junjiro Okajima -# -# This program, aufs is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -# library functions for aufs shell scripts - -# path in canonical representation -SetDir() # var dir -{ - cd "$2" - eval "$1=\"$PWD\"" - cd "$OLDPWD" -} - -# escape the unprintable characters, mainly for grep-ping /proc/mounts -Esc() # [-e] -{ - sed -r -e ' - s/\\/\\134/g - s/$/\\012/ - ' | - tr -d '\n' | - sed -r -e ' - s/ /\\040/g - s/\t/\\011/g - s/\r/\\015/g - s/\\012$// - ' | - { test $# -eq 1 && - test "$1" = "-e" && - sed -r -e 's/\\/\\\\/g' || - cat; } - echo -} - -# find a mount-entry by its mount-point -FindMntEnt() # mntpnt -{ - proc_mounts=/proc/self/mounts - test ! -e $proc_mounts && proc_mounts=/proc/$$/mounts - test ! -e $proc_mounts && proc_mounts=/proc/mounts - fgrep \ $(echo "$1" | Esc)\ aufs\ $proc_mounts | - tail -n 1 -} - -# current mount options -MntOpts() # mntpnt -{ - FindMntEnt "$1" | - cut -f4 -d' ' -} - -######################################## - -AuDebug() # 1 | 0 [sec] -{ - test $1 -eq 0 && set +x - aufs_debug=/sys/module/aufs/parameters/debug - if [ -f $aufs_debug ] - then - echo $1 | sudo dd of=$aufs_debug 2> /dev/null - test $# -eq 2 && sleep $2 - fi - test $1 -eq 1 && set -x - true -} - -# Local variables: ; -# mode: text; -# End: ; diff --git a/package/aufs2-util/src/auplink.c b/package/aufs2-util/src/auplink.c deleted file mode 100644 index 1b48bea51..000000000 --- a/package/aufs2-util/src/auplink.c +++ /dev/null @@ -1,64 +0,0 @@ -/* - * Copyright (C) 2005-2009 Junjiro Okajima - * - * This program, aufs is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - */ - -#include <stdio.h> -#include <stdlib.h> -#include <string.h> -#include <unistd.h> - -#include "au_util.h" - -static void usage(char *me) -{ - fprintf(stderr, - "usage: %s aufs_mount_point list|cpup|flush\n" - "'list' shows the pseudo-linked inode numbers and filenames.\n" - "'cpup' copies-up all pseudo-link to the writeble branch.\n" - "'flush' calls 'cpup', and then 'mount -o remount,clean_plink=inum'\n" - "and remove the whiteouted plink.\n", me); - exit(EINVAL); -} - -int main(int argc, char *argv[]) -{ - int err, cmd; - char *cwd; - - if (argc != 3) - usage(argv[0]); - - if (!strcmp(argv[2], "flush")) - cmd = AuPlink_FLUSH; - else if (!strcmp(argv[2], "list")) - cmd = AuPlink_LIST; - else if (!strcmp(argv[2], "cpup")) - cmd = AuPlink_CPUP; - else { - errno = EINVAL; - AuFin("%s", argv[2]); - cmd = 0; /* never reach here */ - } - - err = chdir(argv[1]); - if (err) - AuFin("chdir"); - cwd = getcwd(NULL, 0); /* glibc */ - if (!cwd) - AuFin("getcwd"); - return au_plink(cwd, cmd, 1, 0); -} diff --git a/package/aufs2-util/src/br.c b/package/aufs2-util/src/br.c deleted file mode 100644 index 6451c120e..000000000 --- a/package/aufs2-util/src/br.c +++ /dev/null @@ -1,172 +0,0 @@ -/* - * Copyright (C) 2005-2009 Junjiro Okajima - * - * This program, aufs is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - */ - -#define _GNU_SOURCE /* strndup */ - -#include <sys/stat.h> -#include <sys/types.h> -#include <mntent.h> -#include <stdio.h> -#include <stdlib.h> -#include <string.h> -#include <unistd.h> - -#include <linux/aufs_type.h> -#include "au_util.h" - -static int by_opts(char ***br, int *nbr, char *bropt) -{ - char *p, **a; - int l; - - /* bropts is placed at the end of mnt_opts */ - errno = EINVAL; - //puts(bropt); - if (strchr(bropt, ',')) - AuFin("%s", bropt); - - l = strlen(bropt); - p = malloc(l + 2); - if (!p) - AuFin("malloc"); - memcpy(p, bropt, l + 1); - bropt = p; - bropt[l + 1] = 0; /* end marker */ - - *nbr = 1; - while (1) { - p = strchr(p + 1, ':'); - if (!p) - break; - *p = 0; - (*nbr)++; - } - - a = malloc(sizeof(a) * (*nbr + 1)); - if (!a) - AuFin("malloc"); - - *br = a; - *a++ = bropt; - p = bropt; - while (*p) { - p += strlen(p) + 1; - *a++ = p; - } - *--a = NULL; - /* don't free bropt */ - - return 0; -} - -#ifdef DEBUG -#define SiPathPrefix "/tmp/aufs/si_" -#define BufSiz 4 -#else -#define SiPathPrefix "/sys/fs/aufs/si_" -#define BufSiz BUFSIZ -#endif - -static int by_sysfs(char ***br, int *nbr, char *siopt) -{ - int err, i, l, sz; - char buf[BufSiz], path[] = SiPathPrefix "1234567890123456/br32767"; - char *p, *end, **a, *q; - FILE *fp; - - errno = EINVAL; - end = strchr(siopt, ','); - if (end) - i = end - siopt; - else - i = strlen(siopt); - - strncpy(path + sizeof(SiPathPrefix) - 1, siopt, i); - p = path + sizeof(SiPathPrefix) - 1 + i; - strcpy(p, "/br"); - p += 3; /* "/br" */ - *nbr = 0; - err = 0; - while (!err) { - sprintf(p, "%d", (*nbr)++); - err = access(path, F_OK); - } - - a = malloc(sizeof(*br) * *nbr); - if (!a) - AuFin("malloc"); - - (*nbr)--; - *br = a; - for (i = 0; i < *nbr; i++) { - sprintf(p, "%d", i); - fp = fopen(path, "r"); - if (!fp) - AuFin("%s", path); - if (fgets(buf, sizeof(buf), fp) != buf) - AuFin("%s", path); - l = strlen(buf); - if (l < 1) - AuFin("internal error, %d", l); - - q = strndup(buf, l - 1); - if (buf[l - 1] != '\n') { - /* a branch path with crazy length */ - /* stat(2) for sysfs is meaningless */ - sz = sizeof(buf); - do { - free(q); - sz <<= 1; - q = malloc(sz); - if (!q) - AuFin("malloc"); - rewind(fp); - if (fgets(q, sz, fp) != q) - AuFin("%s", path); - l = strlen(q); - } while (q[l - 1] != '\n'); - q[l - 1] = 0; - } - - *a++ = q; - /* don't free q */ - fclose(fp); /* ignore */ - } - *a = NULL; - - return 0; -} - -#define BrOpt ",br:" -#define SiOpt "si" -int au_br(char ***br, int *nbr, struct mntent *ent) -{ - char *p; - - *nbr = 0; - p = strstr(ent->mnt_opts, BrOpt); - if (p) - return by_opts(br, nbr, p + sizeof(BrOpt) - 1); - p = hasmntopt(ent, SiOpt); - if (p) - return by_sysfs(br, nbr, p + sizeof(SiOpt)); - - /* broken opts */ - AuFin("internal error, %s", ent->mnt_opts); - return -1; /* never reach here */ -} diff --git a/package/aufs2-util/src/c2sh.c b/package/aufs2-util/src/c2sh.c deleted file mode 100644 index 80ef044a1..000000000 --- a/package/aufs2-util/src/c2sh.c +++ /dev/null @@ -1,42 +0,0 @@ -/* - * Copyright (C) 2005-2009 Junjiro Okajima - * - * This program, aufs is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - */ - -#include <stdio.h> -#include <linux/aufs_type.h> - -#define AUFS_WH_PFX2 AUFS_WH_PFX AUFS_WH_PFX - -int -main(int argc, char *argv[]) -{ -#define p(m, v, fmt) printf("%s=" fmt "\n", m, v) -#define pstr(m) p(#m, m, "%s") -#define pint(m) p(#m, m, "%d") - pstr(AUFS_VERSION); - pint(AUFS_SUPER_MAGIC); - printf("AUFS_SUPER_MAGIC_HEX=0x%x\n", AUFS_SUPER_MAGIC); - pstr(AUFS_WH_PFX); - pstr(AUFS_WH_PFX2); - pstr(AUFS_WKQ_NAME); - pstr(AUFS_WH_DIROPQ); - pstr(AUFS_WH_BASE); - pstr(AUFS_WH_PLINKDIR); - pstr(AUFS_WH_ORPHDIR); - //pint(AUFS_BRANCH_MAX); - return 0; -} diff --git a/package/aufs2-util/src/c2tmac.c b/package/aufs2-util/src/c2tmac.c deleted file mode 100644 index 0018763b4..000000000 --- a/package/aufs2-util/src/c2tmac.c +++ /dev/null @@ -1,44 +0,0 @@ - -/* - * Copyright (C) 2005-2009 Junjiro Okajima - * - * This program, aufs is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - */ - -#include <stdio.h> -#include <linux/aufs_type.h> - -int -main(int argc, char *argv[]) -{ -#define p(m, v, fmt) printf(".ds %s " fmt "\n", m, v) -#define pstr(m) p(#m, m, "%s") -#define pint(m) p(#m, m, "%d") - pstr(AUFS_VERSION); - pstr(AUFS_XINO_FNAME); - pstr(AUFS_XINO_DEFPATH); - pint(AUFS_DIRWH_DEF); - pstr(AUFS_WH_PFX); - pint(AUFS_WH_PFX_LEN); - pstr(AUFS_WKQ_NAME); - pint(AUFS_NWKQ_DEF); - pstr(AUFS_WH_DIROPQ); - pstr(AUFS_WH_BASE); - pstr(AUFS_WH_PLINKDIR); - pint(AUFS_MFS_SECOND_DEF); - pint(AUFS_RDBLK_DEF); - pint(AUFS_RDHASH_DEF); - return 0; -} diff --git a/package/aufs2-util/src/compat.h b/package/aufs2-util/src/compat.h deleted file mode 100644 index ddb436e7e..000000000 --- a/package/aufs2-util/src/compat.h +++ /dev/null @@ -1,34 +0,0 @@ -/* - * Copyright (C) 2009 Junjiro Okajima - * - * This program, aufs is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - */ - -#ifndef __compat_h__ -#define __compat_h__ - -#ifndef AT_SYMLINK_NOFOLLOW -#define AT_SYMLINK_NOFOLLOW 0x100 /* Do not follow symbolic links. */ - -#define __KERNEL__ -#include <unistd.h> -#include <asm/unistd.h> -#define fstatat fstatat64 -int fstatat(int dirfd, const char *path, struct stat *buf, int flags); -_syscall4(int, fstatat64, int, _dirfd, const char *, path, struct stat *, buf, int, flags); -#undef __KERNEL__ -#endif - -#endif /* __compat_h__ */ diff --git a/package/aufs2-util/src/mount.aufs.c b/package/aufs2-util/src/mount.aufs.c deleted file mode 100644 index d801cfd3c..000000000 --- a/package/aufs2-util/src/mount.aufs.c +++ /dev/null @@ -1,255 +0,0 @@ -/* - * Copyright (C) 2005-2009 Junjiro Okajima - * - * This program, aufs is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - */ - -/* - * The main purpose of this script is updating /etc/mtab and calling auplilnk. - * This behaviour is highly depending on mount(8) in util-linux package. - */ - -#define _XOPEN_SOURCE 500 /* getsubopt */ -#define _BSD_SOURCE /* dirfd */ - -#include <sys/types.h> -#include <dirent.h> -#include <mntent.h> -#include <regex.h> -#include <stdio.h> -#include <stdlib.h> -#include <string.h> -#include <unistd.h> -#include <wait.h> - -#include <linux/aufs_type.h> -#include "au_util.h" - -enum { Remount, Bind, Fake, Update, Verbose, AuFlush, LastOpt }; -static void test_opts(char opts[], unsigned char flags[]) -{ - int c; - char *p, *o, *val, *pat[] = { - [Remount] = "remount", - [Bind] = "bind", - NULL - }; - - o = strdup(opts); - if (!o) - AuFin("stdup"); - - p = o; - while (*p) { - c = getsubopt(&p, pat, &val); - switch (c) { - case Remount: - flags[Remount] = 1; - break; - case Bind: - flags[Bind] = 1; - break; - } - } - free(o); -} - -static int test_flush(char opts[]) -{ - int err, i; - regex_t preg; - char *p, *o; - const char *pat = "^((add|ins|append|prepend|del)[:=]" - "|(mod|imod)[:=][^,]*=ro" - "|(noplink|ro)$)"; - - - o = strdup(opts); - if (!o) - AuFin("stdup"); - - p = o; - i = 1; - while ((p = strchr(p, ','))) { - i++; - *p++ = 0; - } - - /* todo: try getsubopt(3)? */ - err = regcomp(&preg, pat, REG_EXTENDED | REG_NOSUB); - if (err) - AuFin("regcomp"); - - p = o; - while (i--) { - if (!regexec(&preg, p, 0, NULL, 0)) { - err = 1; - break; - } else - p += strlen(p) + 1; - } - regfree(&preg); - free(o); - - return err; -} - -static void do_mount(char *dev, char *mntpnt, int argc, char *argv[], - unsigned char flags[]) -{ - int i; - const int ac = argc + 6; - char *av[ac], **a; - - /* todo: eliminate the duplicated options */ - a = av; - *a++ = "mount"; - *a++ = "-i"; - if (flags[Fake]) - *a++ = "-f"; - if (!flags[Bind] || !flags[Update]) - *a++ = "-n"; - if (flags[Bind] && flags[Verbose]) - *a++ = "-v"; - *a++ = "-t"; - *a++ = AUFS_NAME; - - for (i = 3; i < argc; i++) - if (strcmp(argv[i], "-v") && strcmp(argv[i], "-n")) - *a++ = argv[i]; - *a++ = dev; - *a++ = mntpnt; - *a++ = NULL; - -#ifdef DEBUG - for (i = 0; av[i] && i < ac; i++) - puts(av[i]); - exit(0); -#endif - execvp("mount", av); - AuFin("mount"); -} - -/* ---------------------------------------------------------------------- */ - -int main(int argc, char *argv[]) -{ - int err, c, status; - pid_t pid; - unsigned char flags[LastOpt]; - struct mntent ent; - char *dev, *mntpnt, *opts, *cwd; - DIR *cur; - - if (argc < 3) { - errno = EINVAL; - AuFin(NULL); - } - - memset(flags, 0, sizeof(flags)); - flags[Update] = 1; - opts = NULL; - - /* mount(8) always passes the arguments in this order */ - dev = argv[1]; - mntpnt = argv[2]; - while ((c = getopt(argc - 2, argv + 2, "fnvo:")) != -1) { - switch (c) { - case 'f': - flags[Fake] = 1; - break; - case 'n': - flags[Update] = 0; - break; - case 'v': - flags[Verbose] = 1; - break; - case 'o': - opts = optarg; - break; - case '?': - case ':': - errno = EINVAL; - AuFin("internal error"); - } - } - - cur = opendir("."); - if (!cur) - AuFin("."); - err = chdir(mntpnt); - if (err) - AuFin("%s", mntpnt); - cwd = getcwd(NULL, 0); /* glibc */ - if (!cwd) - AuFin("getcwd"); - err = fchdir(dirfd(cur)); - if (err) - AuFin("fchdir"); - closedir(cur); /* ignore */ - - if (opts) - test_opts(opts, flags); - - if (!flags[Bind] && flags[Update]) { - err = access(MTab, R_OK | W_OK); - if (err) - AuFin(MTab); - } - - if (flags[Remount]) { - errno = EINVAL; - if (flags[Bind]) - AuFin("both of remount and bind are specified"); - flags[AuFlush] = test_flush(opts); - if (flags[AuFlush] /* && !flags[Fake] */) { - err = au_plink(cwd, AuPlink_FLUSH, 1, 1); - if (err) - AuFin(NULL); - } - } - - pid = fork(); - if (!pid) { - /* actual mount operation */ - do_mount(dev, mntpnt, argc, argv, flags); - return 0; - } else if (pid < 0) - AuFin("fork"); - - err = waitpid(pid, &status, 0); - if (err < 0) - AuFin("child process"); - - err = !WIFEXITED(status); - if (!err) - err = WEXITSTATUS(status); - - if (!err && !flags[Bind]) { - if (flags[Update]) - err = au_update_mtab(cwd, flags[Remount], - flags[Verbose]); - else if (flags[Verbose]) { - /* withoug blocking plink */ - err = au_proc_getmntent(cwd, &ent); - if (!err) - au_print_ent(&ent); - else - AuFin("internal error"); - } - } - - return err; -} diff --git a/package/aufs2-util/src/mtab.c b/package/aufs2-util/src/mtab.c deleted file mode 100644 index 713e9e267..000000000 --- a/package/aufs2-util/src/mtab.c +++ /dev/null @@ -1,216 +0,0 @@ -/* - * Copyright (C) 2005-2009 Junjiro Okajima - * - * This program, aufs is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - */ - -/* cf. fstab.c or the locking for /etc/mtab in util-linux */ -/* - * we need to extract a part of util-linux and create a simple and generic - * library for locking /etc/mtab. - */ - -/* #include <linux/proc_fs.h> */ -#define PROC_SUPER_MAGIC 0x9fa0 -#include <sys/stat.h> -#include <sys/statfs.h> -#include <sys/types.h> -#include <sys/wait.h> -#include <fcntl.h> -#include <mntent.h> -#include <stdio.h> -#include <string.h> -#include <unistd.h> - -#include "au_util.h" - -void au_print_ent(struct mntent *ent) -{ - printf("%s on %s type %s (%s)\n", - ent->mnt_fsname, ent->mnt_dir, ent->mnt_type, ent->mnt_opts); -} - -/* ---------------------------------------------------------------------- */ - -static void lock_mtab(char *pid_file) -{ - int err, i; - - for (i = 0; i < 5; i++) { - err = link(pid_file, MTab "~"); - if (!err) - break; - sleep(1); - } - if (err) - AuFin(MTab "~"); -} - -static void unlock_mtab(void) -{ - int err; - - err = rename(MTab "~", MTab); - if (err) - AuFin(MTab); -} - -static void append_mtab(FILE *fp, FILE *ofp, struct mntent *ent) -{ - int err; - struct mntent *p; - - while ((p = getmntent(ofp))) { - err = addmntent(fp, p); - if (err) - AuFin("addmntent"); - } - - err = addmntent(fp, ent); - if (err) - AuFin("addmntent"); -} - -/* todo: there are some cases which options are not changed */ -static void update_mtab(FILE *fp, char *mntpnt, int do_remount, int do_verbose) -{ - int err; - long pos; - FILE *ofp; - struct mntent ent, *p; - - /* prohibit updating mount options for this mntpnt */ - au_plink_maint(mntpnt); - err = au_proc_getmntent(mntpnt, &ent); - if (err) - AuFin("no such mount point"); - - ofp = setmntent(MTab, "r"); - if (!ofp) - AuFin(MTab); - - if (do_remount) { - /* find the last one */ - pos = -1; - while ((p = getmntent(ofp))) { - if (!strcmp(p->mnt_dir, mntpnt)) - pos = ftell(ofp); - } - rewind(ofp); - - if (pos > 0) { - while ((p = getmntent(ofp))) { - if (ftell(ofp) == pos) { - /* replace the line */ - p = &ent; - pos = -1; - } - err = addmntent(fp, p); - if (err) - AuFin("addmntent"); - } - if (pos > 0) - AuFin("internal error"); - } else - append_mtab(fp, ofp, &ent); - } else - append_mtab(fp, ofp, &ent); - - endmntent(ofp); /* ignore */ - au_plink_maint(NULL); - if (do_verbose) - au_print_ent(&ent); -} - -/* ---------------------------------------------------------------------- */ - -int au_update_mtab(char *mntpnt, int do_remount, int do_verbose) -{ - int err, fd, status, e2; - pid_t pid; - ino_t ino; - struct stat st; - struct statfs stfs; - struct flock flock = { - .l_type = F_WRLCK, - .l_whence = SEEK_SET, - .l_start = 0, - .l_len = 0 - }; - char pid_file[sizeof(MTab "~.") + 20]; - FILE *fp; - - err = statfs(MTab, &stfs); - if (stfs.f_type == PROC_SUPER_MAGIC) - return 0; - - snprintf(pid_file, sizeof(pid_file), MTab "~.%d", getpid()); - fd = open(pid_file, O_RDWR | O_CREAT | O_EXCL, - S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH); - if (fd < 0) - AuFin("%s", pid_file); - err = fcntl(fd, F_SETLK, &flock); - if (err) - AuFin("%s", pid_file); - fp = fdopen(fd, "r+"); - if (!fp) - AuFin("%s", pid_file); - - pid = fork(); - if (!pid) { - lock_mtab(pid_file); - update_mtab(fp, mntpnt, do_remount, do_verbose); - unlock_mtab(); - return 0; - } else if (pid < 0) - AuFin("fork"); - - err = fstat(fd, &st); - if (err) - perror(pid_file); - ino = st.st_ino; - - err = waitpid(pid, &status, 0); - if (err < 0) { - perror(pid_file); - goto out; - } - err = !WIFEXITED(status); - if (!err) - err = WEXITSTATUS(status); - - e2 = unlink(pid_file); - if (e2 && errno != ENOENT) - perror(pid_file); - e2 = stat(MTab "~", &st); - if (!e2) { - if (st.st_ino == ino) { - /* - * The inode number is same, - * it means it is we who made the file. - * If someone else removed our file between stat(2) and - * unlink(2), it is a breakage of the rule. - */ - e2 = unlink(MTab "~"); - if (e2) - perror(MTab); - } - } else if (errno != ENOENT) - perror(MTab "~"); - fclose(fp); - - out: - return err; -} diff --git a/package/aufs2-util/src/plink.c b/package/aufs2-util/src/plink.c deleted file mode 100644 index 6ff16c76a..000000000 --- a/package/aufs2-util/src/plink.c +++ /dev/null @@ -1,356 +0,0 @@ -/* - * Copyright (C) 2005-2009 Junjiro Okajima - * - * This program, aufs is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - */ - -#define _FILE_OFFSET_BITS 64 /* ftw.h */ -#define _XOPEN_SOURCE 500 /* ftw.h */ -#define _GNU_SOURCE /* ftw.h */ - -#include <sys/ioctl.h> -#include <sys/resource.h> -#include <sys/time.h> -#include <sys/types.h> -#include <dirent.h> -#include <ftw.h> -#include <mntent.h> -#include <stdio.h> -#include <stdlib.h> -#include <string.h> -#include <unistd.h> - -#include <linux/aufs_type.h> -#include "au_util.h" - -/* todo: try argz? */ -static struct name_array { - char *o; - int bytes; - - char *cur; - int nname; -} na; - -static struct ino_array { - char *o; - int bytes; - - union { - char *p; - ino_t *cur; - }; - int nino; -} ia; - -static int na_append(char *plink_dir, char *name) -{ - int l, sz; - char *p; - const int cur = na.cur - na.o; - - l = strlen(plink_dir) + strlen(name) + 2; - sz = na.bytes + l; - p = realloc(na.o, sz); - if (!p) - AuFin("realloc"); - - na.o = p; - na.bytes = sz; - na.cur = p + cur; - na.cur += sprintf(na.cur, "%s/%s", plink_dir, name) + 1; - na.nname++; - - return 0; -} - -static int ia_append(ino_t ino) -{ - int sz; - char *p; - const int cur = ia.p - ia.o; - - sz = na.bytes + sizeof(ino_t); - p = realloc(ia.o, sz); - if (!p) - AuFin("realloc"); - - ia.o = p; - ia.bytes = sz; - ia.p = p + cur; - *ia.cur++ = ino; - ia.nino++; - - return 0; -} - -static int build_array(char *plink_dir) -{ - int err; - DIR *dp; - struct dirent *de; - char *p; - ino_t ino; - - err = access(plink_dir, F_OK); - if (err) - return 0; - - err = 0; - dp = opendir(plink_dir); - if (!dp) - AuFin("%s", plink_dir); - while ((de = readdir(dp))) { - if (!strcmp(de->d_name, ".") || !strcmp(de->d_name, "..")) - continue; -#if 0 - if (de->d_type == DT_DIR) { - errno = EISDIR; - AuFin(de->d_name); - } -#endif - - err = na_append(plink_dir, de->d_name); - if (err) - break; - - p = strchr(de->d_name, '.'); - if (!p) { - errno = EINVAL; - AuFin("internal error, %s", de->d_name); - } - *p = 0; - errno = 0; - ino = strtoull(de->d_name, NULL, 0); - if (ino == /*ULLONG_MAX*/-1 && errno == ERANGE) - AuFin("internal error, %s", de->d_name); - err = ia_append(ino); - if (err) - break; - } - closedir(dp); - - return err; -} - -static int ia_test(ino_t ino) -{ - int i; - ino_t *p; - - /* todo: hash table */ - ia.p = ia.o; - p = ia.cur; - for (i = 0; i < ia.nino; i++) - if (*p++ == ino) - return 1; - return 0; -} - -/* ---------------------------------------------------------------------- */ - -static int ftw_list(const char *fname, const struct stat *st, int flags, - struct FTW *ftw) -{ - if (!strcmp(fname + ftw->base, AUFS_WH_PLINKDIR)) - return FTW_SKIP_SUBTREE; - if (flags == FTW_D || flags == FTW_DNR) - return FTW_CONTINUE; - - if (ia_test(st->st_ino)) - puts(fname); - - return FTW_CONTINUE; -} - -static int ftw_cpup(const char *fname, const struct stat *st, int flags, - struct FTW *ftw) -{ - int err; - - if (!strcmp(fname + ftw->base, AUFS_WH_PLINKDIR)) - return FTW_SKIP_SUBTREE; - if (flags == FTW_D || flags == FTW_DNR) - return FTW_CONTINUE; - - /* - * do nothing but update something harmless in order to make it copyup - */ - if (ia_test(st->st_ino)) { - Dpri("%s\n", fname); - if (!S_ISLNK(st->st_mode)) - err = chown(fname, -1, -1); - else - err = lchown(fname, -1, -1); - if (err) - AuFin("%s", fname); - } - - return FTW_CONTINUE; -} - -/* ---------------------------------------------------------------------- */ - -static DIR *dp; -void au_plink_maint(char *path) -{ - int err; - - if (path) { - if (dp) { - errno = EINVAL; - AuFin("dp is not NULL"); - } - dp = opendir(path); - if (!dp) - AuFin("%s", path); - - err = ioctl(dirfd(dp), AUFS_CTL_PLINK_MAINT); -#ifndef DEBUG - if (err) - AuFin("AUFS_CTL_PLINK_MAINT"); -#endif - } else { - err = closedir(dp); - if (err) - AuFin("closedir"); - dp = NULL; - } -} - -void au_clean_plink(void) -{ - int err; - - err = ioctl(dirfd(dp), AUFS_CTL_PLINK_CLEAN); -#ifndef DEBUG - if (err) - AuFin("AUFS_CTL_PLINK_CLEAN"); -#endif -} - -static int do_plink(char *cwd, int cmd, int nbr, char *br[]) -{ - int err, i, l; - struct rlimit rlim; - __nftw_func_t func; - char *p; - - err = 0; - switch (cmd) { - case AuPlink_FLUSH: - /*FALLTHROUGH*/ - case AuPlink_CPUP: - func = ftw_cpup; - break; - case AuPlink_LIST: - func = ftw_list; - break; - default: - errno = EINVAL; - AuFin(NULL); - func = NULL; /* never reach here */ - } - - for (i = 0; i < nbr; i++) { - //puts(br[i]); - p = strchr(br[i], '='); - if (strcmp(p + 1, AUFS_BRPERM_RW) - && strcmp(p + 1, AUFS_BRPERM_RWNLWH)) - continue; - - *p = 0; - l = strlen(br[i]); - p = malloc(l + sizeof(AUFS_WH_PLINKDIR) + 2); - if (!p) - AuFin("malloc"); - sprintf(p, "%s/%s", br[i], AUFS_WH_PLINKDIR); - //puts(p); - err = build_array(p); - if (err) - AuFin("build_array"); - free(p); - } - if (!ia.nino) - goto out; - - if (cmd == AuPlink_LIST) { - ia.p = ia.o; - for (i = 0; i < ia.nino; i++) - printf("%llu ", (unsigned long long)*ia.cur++); - putchar('\n'); - } - - err = getrlimit(RLIMIT_NOFILE, &rlim); - if (err) - AuFin("getrlimit"); - nftw(cwd, func, rlim.rlim_cur - 10, - FTW_PHYS | FTW_MOUNT | FTW_ACTIONRETVAL); - /* ignore */ - - if (cmd == AuPlink_FLUSH) { - au_clean_plink(); - - na.cur = na.o; - for (i = 0; i < na.nname; i++) { - Dpri("%s\n", na.cur); - err = unlink(na.cur); - if (err) - AuFin("%s", na.cur); - na.cur += strlen(na.cur) + 1; - } - } - - out: - free(ia.o); - free(na.o); - return err; -} - -int au_plink(char cwd[], int cmd, int begin_maint, int end_maint) -{ - int err, nbr; - struct mntent ent; - char **br; - - if (begin_maint) - au_plink_maint(cwd); - - err = au_proc_getmntent(cwd, &ent); - if (err) - AuFin("no such mount point"); - - if (hasmntopt(&ent, "noplink")) - goto out; /* success */ - -#ifdef DEBUG - //char a[] = "a,b,br:/tmp/br0=rw:/br1=ro"; - char a[] = "a,b,si=1,c"; - ent.mnt_opts = a; -#endif - err = au_br(&br, &nbr, &ent); - //printf("nbr %d\n", nbr); - if (err) - AuFin(NULL); - - err = do_plink(cwd, cmd, nbr, br); - if (err) - AuFin(NULL); - - out: - if (end_maint) - au_plink_maint(NULL); - return err; -} diff --git a/package/aufs2-util/src/proc_mnt.c b/package/aufs2-util/src/proc_mnt.c deleted file mode 100644 index 5230aa259..000000000 --- a/package/aufs2-util/src/proc_mnt.c +++ /dev/null @@ -1,85 +0,0 @@ -/* - * Copyright (C) 2005-2009 Junjiro Okajima - * - * This program, aufs is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - */ - -#include <sys/types.h> -#include <errno.h> -#include <mntent.h> -#include <stdio.h> -#include <stdlib.h> -#include <string.h> - -#include "au_util.h" - -#define ProcMounts "/proc/self/mounts" - -static void copy_ent(struct mntent *dst, struct mntent *src) -{ - free(dst->mnt_opts); - free(dst->mnt_type); - free(dst->mnt_dir); - free(dst->mnt_fsname); - - dst->mnt_dir = NULL; - dst->mnt_type = NULL; - dst->mnt_opts = NULL; - - dst->mnt_fsname = strdup(src->mnt_fsname); - if (dst->mnt_fsname) - dst->mnt_dir = strdup(src->mnt_dir); - if (dst->mnt_dir) - dst->mnt_type = strdup(src->mnt_type); - if (dst->mnt_type) - dst->mnt_opts = strdup(src->mnt_opts); - if (dst->mnt_opts) { - dst->mnt_freq = src->mnt_freq; - dst->mnt_passno = src->mnt_passno; - } else - AuFin("strdup"); - -} - -int au_proc_getmntent(char *mntpnt, struct mntent *rent) -{ - int found; - struct mntent *p; - FILE *fp; - - fp = setmntent(ProcMounts, "r"); - if (!fp) - AuFin(ProcMounts); - - /* find the last one */ - memset(rent, 0, sizeof(*rent)); - found = 0; - while ((p = getmntent(fp))) - if (!strcmp(p->mnt_dir, mntpnt)) { - Dpri("%s, %s, %s, %s, %d, %d\n", - p->mnt_fsname, p->mnt_dir, p->mnt_type, - p->mnt_opts, p->mnt_freq, p->mnt_passno); - copy_ent(rent, p); - found = 1; - } - endmntent(fp); - - if (!found) { - errno = EINVAL; - AuFin("%s", mntpnt); - } - - return 0; -} diff --git a/package/aufs2-util/src/rdu.c b/package/aufs2-util/src/rdu.c deleted file mode 100644 index ac958f084..000000000 --- a/package/aufs2-util/src/rdu.c +++ /dev/null @@ -1,749 +0,0 @@ -/* - * Copyright (C) 2009 Junjiro Okajima - * - * This program, aufs is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - */ - -#define _ATFILE_SOURCE -#define _GNU_SOURCE -#define _REENTRANT - -#include <linux/aufs_type.h> -#include <sys/ioctl.h> -#include <sys/stat.h> -#include <sys/types.h> -#include <sys/vfs.h> /* or <sys/statfs.h> */ -#include <assert.h> -#include <dirent.h> -#include <dlfcn.h> -#include <errno.h> -#include <fcntl.h> -#include <pthread.h> -#include <search.h> -#include <stdio.h> -#include <stdlib.h> -#include <string.h> -#include <unistd.h> - -#include "compat.h" - -/* ---------------------------------------------------------------------- */ - -struct rdu { -#ifdef AuRDU_REENTRANT - pthread_rwlock_t lock; -#else - struct dirent de; -#endif - - int fd; - - unsigned long npos, idx; - struct au_rdu_ent **pos; - - unsigned long nent, sz; - struct au_rdu_ent *ent; - - int shwh; - struct au_rdu_ent *real, *wh; -}; - -static struct rdu **rdu; -#define RDU_STEP 8 -static int rdu_cur, rdu_lim = RDU_STEP; - -/* ---------------------------------------------------------------------- */ - -/* #define RduLocalTest */ -#ifdef RduLocalTest -static int rdu_test_data(struct rdu *p, int err) -{ - struct au_rdu_ent *e = p->ent; - static int i; - - if (!i++) { - err = 3; - e->ino = e->type = e->nlen = 1; - strcpy(e->name, "."); - e += au_rdu_len(e->nlen); - e->ino = e->type = e->nlen = 2; - strcpy(e->name, ".."); - e += au_rdu_len(e->nlen); - e->ino = e->type = e->nlen = 3; - strcpy(e->name, "foo"); - } else - err = 0; - - return err; -} -#else -static int rdu_test_data(struct rdu *p, int err) -{ - return err; -} -#endif - -/* #define RduDebug */ -#ifdef RduDebug -#define DPri(fmt, args...) fprintf(stderr, "%s:%d: " fmt, \ - __func__, __LINE__, ##args) -#else -#define DPri(fmt, args...) do {} while (0) -#endif - -/* ---------------------------------------------------------------------- */ - -#ifdef AuRDU_REENTRANT -static void rdu_rwlock_init(struct rdu *p) -{ - pthread_rwlock_init(&p->lock); -} - -static void rdu_read_lock(struct rdu *p) -{ - pthread_rwlock_rdlock(&p->lock); -} - -static void rdu_write_lock(struct rdu *p) -{ - pthread_rwlock_wrlock(&p->lock); -} - -static void rdu_unlock(struct rdu *p) -{ - pthread_rwlock_unlock(&p->lock); -} - -static pthread_mutex_t rdu_lib_mtx = PTHREAD_MUTEX_INITIALIZER; -#define rdu_lib_lock() pthread_mutex_lock(&rdu_lib_mtx) -#define rdu_lib_unlock() pthread_mutex_unlock(&rdu_lib_mtx) -#define rdu_lib_must_lock() assert(pthread_mutex_trylock(&rdu_lib_mtx)) -#else -static void rdu_rwlock_init(struct rdu *p) -{ - /* empty */ -} - -static void rdu_read_lock(struct rdu *p) -{ - /* empty */ -} - -static void rdu_write_lock(struct rdu *p) -{ - /* empty */ -} - -static void rdu_unlock(struct rdu *p) -{ - /* empty */ -} - -#define rdu_lib_lock() do {} while(0) -#define rdu_lib_unlock() do {} while(0) -#define rdu_lib_must_lock() do {} while(0) -#endif - -/* - * initialize this library, particularly global variables. - */ -static int rdu_lib_init(void) -{ - int err; - - err = 0; - if (rdu) - goto out; - - rdu_lib_lock(); - if (!rdu) { - rdu = calloc(rdu_lim, sizeof(*rdu)); - err = !rdu; - } - rdu_lib_unlock(); - - out: - return err; -} - -static int rdu_append(struct rdu *p) -{ - int err, i; - void *t; - - rdu_lib_must_lock(); - - err = 0; - if (rdu_cur < rdu_lim - 1) - rdu[rdu_cur++] = p; - else { - t = realloc(rdu, rdu_lim + RDU_STEP * sizeof(*rdu)); - if (t) { - rdu = t; - rdu_lim += RDU_STEP; - rdu[rdu_cur++] = p; - for (i = 0; i < RDU_STEP - 1; i++) - rdu[rdu_cur + i] = NULL; - } else - err = -1; - } - - return err; -} - -/* ---------------------------------------------------------------------- */ - -static struct rdu *rdu_new(int fd) -{ - struct rdu *p; - int err; - - p = malloc(sizeof(*p)); - if (p) { - rdu_rwlock_init(p); - p->fd = fd; - p->sz = BUFSIZ; - p->ent = malloc(BUFSIZ); - if (p->ent) { - err = rdu_append(p); - if (!err) - goto out; /* success */ - } - } - free(p); - p = NULL; - - out: - return p; -} - -static struct rdu *rdu_buf_lock(int fd) -{ - struct rdu *p; - int i; - - assert(rdu); - assert(fd >= 0); - - p = NULL; - rdu_lib_lock(); - for (i = 0; i < rdu_cur; i++) - if (rdu[i] && rdu[i]->fd == fd) { - p = rdu[i]; - goto out; - } - - for (i = 0; i < rdu_cur; i++) - if (rdu[i] && rdu[i]->fd == -1) { - p = rdu[i]; - p->fd = fd; - goto out; - } - if (!p) - p = rdu_new(fd); - - out: - if (p) - rdu_write_lock(p); - rdu_lib_unlock(); - - return p; -} - -static void rdu_free(int fd) -{ - struct rdu *p; - - p = rdu_buf_lock(fd); - if (p) { - free(p->ent); - free(p->pos); - p->fd = -1; - p->ent = NULL; - p->pos = NULL; - rdu_unlock(p); - } -} - -/* ---------------------------------------------------------------------- */ - -static int rdu_do_store(int dirfd, struct au_rdu_ent *ent, - struct au_rdu_ent **pos, struct rdu *p) -{ - int err; - unsigned char c; - struct stat st; - - c = ent->name[ent->nlen]; - ent->name[ent->nlen] = 0; - DPri("%s\n", ent->name); - err = fstatat(dirfd, ent->name, &st, AT_SYMLINK_NOFOLLOW); - ent->name[ent->nlen] = c; - if (!err) { - ent->ino = st.st_ino; - pos[p->idx++] = ent; - } else { - DPri("err %d\n", err); - if (errno == ENOENT) - err = 0; - } - - return err; -} - -struct rdu_thread_arg { - int pipefd; - struct rdu *p; -}; - -static void *rdu_thread(void *_arg) -{ - int err, pipefd, dirfd; - ssize_t ssz; - struct rdu_thread_arg *arg = _arg; - struct au_rdu_ent *ent, **pos; - struct rdu *p; - - pipefd = arg->pipefd; - p = arg->p; - dirfd = p->fd; - pos = p->pos; - while (1) { - DPri("read\n"); - ssz = read(pipefd, &ent, sizeof(ent)); - DPri("ssz %zd\n", ssz); - if (ssz != sizeof(ent) || !ent) { - //perror("read"); - break; - } - - //DPri("%p\n", ent); - err = rdu_do_store(dirfd, ent, pos, p); - } - - DPri("here\n"); - return NULL; -} - -static int rdu_store(struct rdu *p, struct au_rdu_ent *ent, int pipefd) -{ -#ifdef RduLocalTest - if (ent) - return rdu_do_store(p->fd, ent, p->pos, p); - return 0; -#else - ssize_t ssz; - - //DPri("%p\n", ent); - ssz = write(pipefd, &ent, sizeof(ent)); - DPri("ssz %zd\n", ssz); - //sleep(1); - return ssz != sizeof(ent); -#endif -} - -/* ---------------------------------------------------------------------- */ -/* the heart of this library */ - -static void rdu_tfree(void *node) -{ - /* empty */ -} - -static int rdu_ent_compar(const void *_a, const void *_b) -{ - int ret; - const struct au_rdu_ent *a = _a, *b = _b; - - ret = (int)a->nlen - b->nlen; - if (!ret) - ret = memcmp(a->name, b->name, a->nlen); - return ret; -} - -static int rdu_ent_compar_wh(const void *_a, const void *_b) -{ - int ret; - const struct au_rdu_ent *real = _a, *wh = _b; - - if (real->nlen >= AUFS_WH_PFX_LEN - && !memcmp(real->name, AUFS_WH_PFX, AUFS_WH_PFX_LEN)) { - wh = _a; - real = _b; - } - - ret = (int)wh->nlen - AUFS_WH_PFX_LEN - real->nlen; - if (!ret) - ret = memcmp(wh->name + AUFS_WH_PFX_LEN, real->name, - real->nlen); - return ret; -} - -/* tsearch(3) may not be thread-safe */ -static int rdu_ent_append(struct rdu *p, struct au_rdu_ent *ent, int pipefd) -{ - int err; - struct au_rdu_ent *e; - - err = 0; - e = tfind(ent, (void *)&p->wh, rdu_ent_compar_wh); - if (e) - goto out; - - e = tsearch(ent, (void *)&p->real, rdu_ent_compar); - if (e) - err = rdu_store(p, ent, pipefd); - else - err = -1; - - out: - return err; -} - -static int rdu_ent_append_wh(struct rdu *p, struct au_rdu_ent *ent, int pipefd) -{ - int err; - struct au_rdu_ent *e; - - err = 0; - e = tfind(ent, (void *)&p->wh, rdu_ent_compar); - if (e) - goto out; - - e = tsearch(ent, (void *)&p->wh, rdu_ent_compar); - if (e) { - if (p->shwh) - err = rdu_store(p, ent, pipefd); - } else - err = -1; - - out: - return err; -} - -static int rdu_merge(struct rdu *p) -{ - int err; - unsigned long ul; - pthread_t th; - int fds[2]; - struct rdu_thread_arg arg; - struct au_rdu_ent *ent; - void *t; - - err = -1; - p->pos = malloc(sizeof(*p->pos) * p->npos); - if (!p->pos) - goto out; - - /* pipe(2) may not be scheduled well in linux-2.6.23 and earlier */ - err = pipe(fds); - if (err) - goto out_free; - - arg.pipefd = fds[0]; - arg.p = p; -#ifndef RduLocalTest - err = pthread_create(&th, NULL, rdu_thread, &arg); -#endif - if (err) - goto out_close; - - p->real = NULL; - p->wh = NULL; - ent = p->ent; - for (ul = 0; !err && ul < p->npos; ul++) { - if (ent->nlen <= AUFS_WH_PFX_LEN - || strncmp(ent->name, AUFS_WH_PFX, AUFS_WH_PFX_LEN)) - err = rdu_ent_append(p, ent, fds[1]); - else - err = rdu_ent_append_wh(p, ent, fds[1]); - ent += au_rdu_len(ent->nlen); - } - rdu_store(p, /*ent*/NULL, fds[1]); /* terminate the thread */ - tdestroy(p->real, rdu_tfree); - tdestroy(p->wh, rdu_tfree); - -#ifndef RduLocalTest - pthread_join(th, NULL); -#endif - p->npos = p->idx; - t = realloc(p->pos, sizeof(*p->pos) * p->npos); - if (t) - p->pos = t; - /* t == NULL is not an error */ - - out_close: - close(fds[1]); - close(fds[0]); - if (!err) - goto out; /* success */ - out_free: - free(p->pos); - p->pos = NULL; - out: - return err; -} - -static int rdu_init(struct rdu *p) -{ - int err; - struct aufs_rdu param; - char *t; - - memset(¶m, 0, sizeof(param)); - param.ent = p->ent; - param.sz = p->sz; - t = getenv("AUFS_RDU_BLK"); - if (t) - param.blk = strtoul(t + sizeof("AUFS_RDU_BLK"), NULL, 0); - - do { - err = ioctl(p->fd, AUFS_CTL_RDU, ¶m); - err = rdu_test_data(p, err); - if (err > 0) { - p->npos += err; - if (!param.full) - continue; - - assert(param.blk); - t = realloc(p->ent, p->sz + param.blk); - if (t) { - param.sz = param.blk; - param.ent = (void *)(t + p->sz); - p->ent = (void *)t; - p->sz += param.blk; - } else - err = -1; - } - } while (err > 0); - p->shwh = param.shwh; - if (!err) - err = rdu_merge(p); - - if (err) { - free(p->ent); - p->ent = NULL; - } - - return err; -} - -static int rdu_pos(struct dirent *de, struct rdu *p, long pos) -{ - int err; - struct au_rdu_ent *ent; - - err = -1; - if (pos <= p->npos) { - ent = p->pos[pos]; - de->d_ino = ent->ino; - de->d_off = pos; - de->d_reclen = sizeof(*ent) + ent->nlen; - de->d_type = ent->type; - memcpy(de->d_name, ent->name, ent->nlen); - de->d_name[ent->nlen] = 0; - err = 0; - } - return err; -} - -/* ---------------------------------------------------------------------- */ - -static struct dirent *(*real_readdir)(DIR *dir); -static int (*real_readdir_r)(DIR *dir, struct dirent *de, struct dirent **rde); -static int (*real_closedir)(DIR *dir); - -static int rdu_dl(void **real, char *sym) -{ - char *p; - - if (*real) - return 0; - - dlerror(); /* clear */ - *real = dlsym(RTLD_NEXT, sym); - p = dlerror(); - if (p) - fprintf(stderr, "%s\n", p); - return !!p; -} - -#define RduDlFunc(sym) \ -static int rdu_dl_##sym(void) \ -{ \ - return rdu_dl((void *)&real_##sym, #sym); \ -} - -RduDlFunc(readdir); -RduDlFunc(closedir); - -#ifdef AuRDU_REENTRANT -RduDlFunc(readdir_r); -#else -#define rdu_dl_readdir_r() 1 -#endif - -/* ---------------------------------------------------------------------- */ - -static int rdu_readdir(DIR *dir, struct dirent *de, struct dirent **rde) -{ - int err, fd; - struct rdu *p; - long pos; - struct statfs stfs; - - if (rde) - *rde = NULL; - - errno = EBADF; - fd = dirfd(dir); - err = fd; - if (fd < 0) - goto out; - - err = fstatfs(fd, &stfs); - if (err) - goto out; - - if ( -#ifdef RduLocalTest - 1 || -#endif - stfs.f_type == AUFS_SUPER_MAGIC) { - err = rdu_lib_init(); - if (err) - goto out; - - p = rdu_buf_lock(fd); - if (!p) - goto out; - - pos = telldir(dir); - if (!pos || !p->npos) { - err = rdu_init(p); - rdu_unlock(p); - } - if (err) - goto out; - - rdu_read_lock(p); - if (!de) - de = &p->de; - err = rdu_pos(de, p, pos); - rdu_unlock(p); - if (!err) { - *rde = de; - seekdir(dir, pos + 1); - } - } else if (!de) { - if (!rdu_dl_readdir()) { - err = 0; - *rde = real_readdir(dir); - if (!*rde) - err = -1; - } - } else { - if (!rdu_dl_readdir_r()) - err = real_readdir_r(dir, de, rde); - } - out: - return err; -} - -struct dirent *readdir(DIR *dir) -{ - struct dirent *de; - int err; - - err = rdu_readdir(dir, NULL, &de); - DPri("err %d\n", err); - return de; -} - -#ifdef AuRDU_REENTRANT -int readdir_r(DIR *dirp, struct dirent *de, struct dirent **rde) -{ - return rdu_readdir(dir, de, rde); -} -#endif - -int closedir(DIR *dir) -{ - int err, fd; - struct statfs stfs; - - errno = EBADF; - fd = dirfd(dir); - if (fd < 0) - goto out; - err = fstatfs(fd, &stfs); - if (err) - goto out; - - if (stfs.f_type == AUFS_SUPER_MAGIC) - rdu_free(fd); - if (!rdu_dl_closedir()) - err = real_closedir(dir); - - out: - return err; -} - -#if 0 -extern DIR *opendir (__const char *__name) __nonnull ((1)); -extern int closedir (DIR *__dirp) __nonnull ((1)); -extern struct dirent *__REDIRECT (readdir, (DIR *__dirp), readdir64) - __nonnull ((1)); -extern struct dirent64 *readdir64 (DIR *__dirp) __nonnull ((1)); -extern int readdir_r (DIR *__restrict __dirp, - struct dirent *__restrict __entry, - struct dirent **__restrict __result) - __nonnull ((1, 2, 3)); -extern int readdir64_r (DIR *__restrict __dirp, - struct dirent64 *__restrict __entry, - struct dirent64 **__restrict __result) - __nonnull ((1, 2, 3)); -extern void rewinddir (DIR *__dirp) __THROW __nonnull ((1)); -extern void seekdir (DIR *__dirp, long int __pos) __THROW __nonnull ((1)); -extern long int telldir (DIR *__dirp) __THROW __nonnull ((1)); -extern int dirfd (DIR *__dirp) __THROW __nonnull ((1)); -extern int scandir (__const char *__restrict __dir, - struct dirent ***__restrict __namelist, - int (*__selector) (__const struct dirent *), - int (*__cmp) (__const void *, __const void *)) - __nonnull ((1, 2)); -extern int scandir64 (__const char *__restrict __dir, - struct dirent64 ***__restrict __namelist, - int (*__selector) (__const struct dirent64 *), - int (*__cmp) (__const void *, __const void *)) - __nonnull ((1, 2)); -extern int alphasort (__const void *__e1, __const void *__e2) - __THROW __attribute_pure__ __nonnull ((1, 2)); -extern int alphasort64 (__const void *__e1, __const void *__e2) - __THROW __attribute_pure__ __nonnull ((1, 2)); -extern int versionsort (__const void *__e1, __const void *__e2) - __THROW __attribute_pure__ __nonnull ((1, 2)); -extern int versionsort64 (__const void *__e1, __const void *__e2) - __THROW __attribute_pure__ __nonnull ((1, 2)); -extern __ssize_t getdirentries (int __fd, char *__restrict __buf, - size_t __nbytes, - __off_t *__restrict __basep) - __THROW __nonnull ((2, 4)); -extern __ssize_t getdirentries64 (int __fd, char *__restrict __buf, - size_t __nbytes, - __off64_t *__restrict __basep) - __THROW __nonnull ((2, 4)); -#endif diff --git a/package/aufs2-util/src/umount.aufs b/package/aufs2-util/src/umount.aufs deleted file mode 100755 index 395689236..000000000 --- a/package/aufs2-util/src/umount.aufs +++ /dev/null @@ -1,31 +0,0 @@ -#!/bin/sh - - -# Copyright (C) 2005-2009 Junjiro Okajima -# -# This program, aufs is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -# -# The main purpose of this script is calling auplink. -# - -PATH=/usr/bin:/usr/sbin:/bin:/sbin -export PATH - -set -e -#set -x; echo $0 $@ -dev="$1" -shift -auplink "$dev" flush -exec umount -i $@ "$dev" diff --git a/package/autossh/patches/patch-Makefile_in b/package/autossh/patches/patch-Makefile_in index 098c3fee1..6aa8a369a 100644 --- a/package/autossh/patches/patch-Makefile_in +++ b/package/autossh/patches/patch-Makefile_in @@ -1,5 +1,14 @@ --- autossh-1.4b.orig/Makefile.in 2008-04-11 22:47:46.000000000 +0200 -+++ autossh-1.4b/Makefile.in 2010-02-05 17:49:30.511836749 +0100 ++++ autossh-1.4b/Makefile.in 2011-01-14 18:20:25.000000000 +0100 +@@ -31,7 +31,7 @@ all: $(TARGET) + + + $(TARGET): $(OFILES) +- $(CC) $(CPPFLAGS) -o $(TARGET) $(OFILES) $(LIBS) ++ $(CC) $(LDFLAGS) -o $(TARGET) $(OFILES) $(LIBS) + + clean: + - /bin/rm -f *.o *.a *.core *~ @@ -45,18 +45,18 @@ distclean: allclean - /bin/rm -f Makefile diff --git a/package/avahi/patches/patch-ltmain_sh b/package/avahi/patches/patch-ltmain_sh new file mode 100644 index 000000000..2bd6af820 --- /dev/null +++ b/package/avahi/patches/patch-ltmain_sh @@ -0,0 +1,11 @@ +--- avahi-0.6.25.orig/ltmain.sh 2009-04-14 03:48:18.000000000 +0200 ++++ avahi-0.6.25/ltmain.sh 2011-01-14 18:46:07.000000000 +0100 +@@ -4765,7 +4765,7 @@ func_mode_link () + # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC + # @file GCC response files + -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) + func_quote_for_eval "$arg" + arg="$func_quote_for_eval_result" + func_append compile_command " $arg" diff --git a/package/axtls/Makefile b/package/axtls/Makefile index c3c659666..62dbb7226 100644 --- a/package/axtls/Makefile +++ b/package/axtls/Makefile @@ -4,9 +4,9 @@ include ${TOPDIR}/rules.mk PKG_NAME:= axtls -PKG_VERSION:= 1.2.2 +PKG_VERSION:= 1.3.0 PKG_RELEASE:= 1 -PKG_MD5SUM:= 03471b5a5874e2ce86025f24b3fa0958 +PKG_MD5SUM:= 4a06dd5b34489f11fbf2b4249a9dd303 PKG_DESCR:= small embedded webserver PKG_SECTION:= net/security PKG_DEPENDS:= libaxtls diff --git a/package/axtls/files/config b/package/axtls/files/config index ed4e64806..a37878b3a 100644 --- a/package/axtls/files/config +++ b/package/axtls/files/config @@ -50,6 +50,7 @@ CONFIG_USE_DEV_URANDOM=y # CONFIG_OPENSSL_COMPATIBLE is not set # CONFIG_PERFORMANCE_TESTING is not set # CONFIG_SSL_TEST is not set +# CONFIG_AXTLSWRAP is not set CONFIG_AXHTTPD=y # @@ -118,3 +119,6 @@ SQU_KARATSUBA_THRESH=0 # CONFIG_BIGINT_SLIDING_WINDOW is not set # CONFIG_BIGINT_SQUARE is not set # CONFIG_BIGINT_CHECK_ON is not set +CONFIG_INTEGER_32BIT=y +# CONFIG_INTEGER_16BIT is not set +# CONFIG_INTEGER_8BIT is not set diff --git a/package/base-files/Makefile b/package/base-files/Makefile index db08b8860..dee9fd9a4 100644 --- a/package/base-files/Makefile +++ b/package/base-files/Makefile @@ -45,11 +45,14 @@ endif mkdir -p $(IDIR_BASE_FILES)/usr/lib/ipkg/lists mkdir -p $(IDIR_BASE_FILES)/etc/crontabs mkdir -p $(IDIR_BASE_FILES)/{dev,boot,root,sys,proc,tmp,mnt} +ifeq (${ADK_INSTALL_PACKAGE_NETWORK_SCRIPTS},y) mkdir -p $(IDIR_BASE_FILES)/etc/network/{if-pre-up.d,if-up.d,if-down.d,if-post-down.d} +endif mkdir -p $(IDIR_BASE_FILES)/usr/{lib,bin} chmod 755 $(IDIR_BASE_FILES)/lib/mdev/init chmod 600 $(IDIR_BASE_FILES)/etc/shadow chmod 600 $(IDIR_BASE_FILES)/etc/network/interfaces + chmod 1777 ${IDIR_BASE_FILES}/tmp ln -sf ../proc/mounts $(IDIR_BASE_FILES)/etc/mtab rm -rf $(IDIR_BASE_FILES)/var ln -sf tmp $(IDIR_BASE_FILES)/var diff --git a/package/base-files/src/etc/network/if-pre-up.d/03-bridge b/package/base-files/src/etc/network/if-pre-up.d/03-bridge index 41ddb2b58..9bdbf8302 100755 --- a/package/base-files/src/etc/network/if-pre-up.d/03-bridge +++ b/package/base-files/src/etc/network/if-pre-up.d/03-bridge @@ -15,6 +15,7 @@ case "$IF_BRIDGE_PORTS" in esac brctl addbr $IFACE || exit 1 +[[ -n $IF_BRIDGE_FD ]] && brctl setfd $IFACE $IF_BRIDGE_FD for IF in $INTERFACES; do if ! grep -q $IF /proc/net/dev; then diff --git a/package/base-files/src/etc/network/if-pre-up.d/04-wireless b/package/base-files/src/etc/network/if-pre-up.d/04-wireless index 78442d8ae..ebcec5a12 100755 --- a/package/base-files/src/etc/network/if-pre-up.d/04-wireless +++ b/package/base-files/src/etc/network/if-pre-up.d/04-wireless @@ -8,6 +8,8 @@ set -e [ "$IF_WIRELESS_HWMODE" ] || IF_WIRELESS_HWMODE=g [ "$IF_WIRELESS_EXTENSION" ] || IF_WIRELESS_EXTENSION=0 +rfkill unblock wlan 2>/dev/null + wpa=0 wpa1=0 wpa2=0 diff --git a/package/bash/Makefile b/package/bash/Makefile index c0b55681e..008d661a7 100644 --- a/package/bash/Makefile +++ b/package/bash/Makefile @@ -17,6 +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+= --disable-rpath \ + --cache-file=/dev/null XAKE_FLAGS+= LIBS_FOR_BUILD='' post-install: diff --git a/package/bind/Makefile b/package/bind/Makefile index fdde3bf10..278982c4b 100644 --- a/package/bind/Makefile +++ b/package/bind/Makefile @@ -24,8 +24,8 @@ PKGSD_BIND_DNSSEC:= dnssec utilities PKGSD_BIND_HOST:= host utility PKGSD_BIND_DIG:= dig utility -PKG_FLAVOURS:= WITH_IPV6 -PKGFD_WITH_IPV6:= enable IPv6 support +PKG_FLAVOURS_BIND_SERVER:= WITH_IPV6 +PKGFD_WITH_IPV6:= enable IPv6 support include ${TOPDIR}/mk/package.mk diff --git a/package/bind/patches/patch-ltmain_sh b/package/bind/patches/patch-ltmain_sh new file mode 100644 index 000000000..30b126894 --- /dev/null +++ b/package/bind/patches/patch-ltmain_sh @@ -0,0 +1,11 @@ +--- bind-9.7.0.orig/ltmain.sh 2009-01-19 02:38:41.000000000 +0100 ++++ bind-9.7.0/ltmain.sh 2011-01-14 18:53:09.000000000 +0100 +@@ -1706,7 +1706,7 @@ EOF + # -F/path gives path to uninstalled frameworks, gcc on darwin + # @file GCC response files + -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) + + # Unknown arguments in both finalize_command and compile_command need + # to be aesthetically quoted because they are evaled later. diff --git a/package/binutils/patches/patch-ld_Makefile_in b/package/binutils/patches/patch-ld_Makefile_in new file mode 100644 index 000000000..ff1eeb88f --- /dev/null +++ b/package/binutils/patches/patch-ld_Makefile_in @@ -0,0 +1,20 @@ +--- binutils-2.21.orig/ld/Makefile.in 2010-11-05 11:34:22.000000000 +0100 ++++ binutils-2.21/ld/Makefile.in 2011-01-10 21:57:49.000000000 +0100 +@@ -422,7 +422,7 @@ TEXI2DVI = texi2dvi -I $(srcdir) -I $(BF + -I $(top_srcdir)/../libiberty + + AM_CPPFLAGS = -I. -I$(srcdir) -I../bfd -I$(BFDDIR) -I$(INCDIR) \ +- @INCINTL@ $(HDEFINES) $(CFLAGS) $(PLUGIN_CFLAGS) \ ++ @INCINTL@ $(HDEFINES) $(PLUGIN_CFLAGS) \ + -DLOCALEDIR="\"$(datadir)/locale\"" + + BFDLIB = ../bfd/libbfd.la +@@ -850,7 +850,7 @@ ld_new_LDADD = $(EMULATION_OFILES) $(EMU + # + @ENABLE_PLUGINS_TRUE@noinst_LTLIBRARIES = libldtestplug.la + @ENABLE_PLUGINS_TRUE@libldtestplug_la_SOURCES = testplug.c +-@ENABLE_PLUGINS_TRUE@libldtestplug_la_CFLAGS = -g -O2 ++@ENABLE_PLUGINS_TRUE@libldtestplug_la_CFLAGS = + @ENABLE_PLUGINS_TRUE@libldtestplug_la_LDFLAGS = -no-undefined -rpath /nowhere + MAINTAINERCLEANFILES = configdoc.texi ld.1 ld.info + diff --git a/package/binutils/patches/patch-ltmain_sh b/package/binutils/patches/patch-ltmain_sh new file mode 100644 index 000000000..18a178908 --- /dev/null +++ b/package/binutils/patches/patch-ltmain_sh @@ -0,0 +1,11 @@ +--- binutils-2.21.orig/ltmain.sh 2010-01-09 22:11:32.000000000 +0100 ++++ binutils-2.21/ltmain.sh 2011-01-14 19:07:08.000000000 +0100 +@@ -4980,7 +4980,7 @@ func_mode_link () + # @file GCC response files + # -tp=* Portland pgcc target processor selection + -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \ +- -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*) ++ -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|-fstack-protector*|-flto) + func_quote_for_eval "$arg" + arg="$func_quote_for_eval_result" + func_append compile_command " $arg" diff --git a/package/bitlbee/Makefile b/package/bitlbee/Makefile index 9c18f0c13..41b56a5ca 100644 --- a/package/bitlbee/Makefile +++ b/package/bitlbee/Makefile @@ -19,7 +19,6 @@ include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,BITLBEE,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) CONFIG_STYLE:= minimal - TCFLAGS+= -fPIC CONFIGURE_ARGS:= --target=${REAL_GNU_TARGET_NAME} \ --prefix=/usr/ \ @@ -33,13 +32,12 @@ CONFIGURE_ARGS:= --target=${REAL_GNU_TARGET_NAME} \ --strip=0 \ --ipv6=1 \ --ssl=openssl - INSTALL_TARGET= install-etc install-bin post-configure: @echo 'CFLAGS+="-I${STAGING_TARGET_DIR}/usr/include/iconv"' >> \ ${WRKBUILD}/Makefile.settings - @echo 'LFLAGS+="-L${STAGING_TARGET_DIR}/usr/lib"' >> \ + @echo 'LFLAGS+=${TARGET_LDFLAGS}' >> \ ${WRKBUILD}/Makefile.settings post-install: diff --git a/package/bluez/patches/patch-Makefile_in b/package/bluez/patches/patch-Makefile_in index 4334402d7..2c4cf7336 100644 --- a/package/bluez/patches/patch-Makefile_in +++ b/package/bluez/patches/patch-Makefile_in @@ -1,6 +1,6 @@ ---- bluez-4.59.orig/Makefile.in Thu Dec 24 17:42:48 2009 -+++ bluez-4.59/Makefile.in Tue Dec 29 01:31:12 2009 -@@ -48,7 +48,6 @@ noinst_PROGRAMS = $(am__EXEEXT_7) $(am__EXEEXT_8) $(am +--- bluez-4.59.orig/Makefile.in 2009-12-24 17:42:48.000000000 +0100 ++++ bluez-4.59/Makefile.in 2011-01-14 19:24:13.000000000 +0100 +@@ -48,7 +48,6 @@ noinst_PROGRAMS = $(am__EXEEXT_7) $(am__ $(am__EXEEXT_10) $(am__EXEEXT_11) @SBC_TRUE@am__append_1 = sbc/libsbc.la @SBC_TRUE@am__append_2 = sbc/sbcinfo sbc/sbcdec sbc/sbcenc @@ -8,7 +8,7 @@ @NETLINK_TRUE@am__append_4 = plugins/netlink.la @ECHOPLUGIN_TRUE@am__append_5 = echo @ECHOPLUGIN_TRUE@am__append_6 = plugins/echo.c -@@ -318,7 +317,6 @@ sbc_libsbc_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $( +@@ -318,7 +317,6 @@ sbc_libsbc_la_LINK = $(LIBTOOL) $(AM_V_l @DUND_TRUE@am__EXEEXT_6 = compat/dund$(EXEEXT) @SBC_TRUE@am__EXEEXT_7 = sbc/sbcinfo$(EXEEXT) sbc/sbcdec$(EXEEXT) \ @SBC_TRUE@ sbc/sbcenc$(EXEEXT) @@ -16,7 +16,7 @@ @TOOLS_TRUE@am__EXEEXT_9 = tools/avinfo$(EXEEXT) tools/ppporc$(EXEEXT) \ @TOOLS_TRUE@ tools/hcieventmask$(EXEEXT) \ @TOOLS_TRUE@ tools/hcisecfilter$(EXEEXT) -@@ -918,8 +916,6 @@ lib_libbluetooth_la_DEPENDENCIES = $(local_headers) +@@ -918,8 +916,6 @@ lib_libbluetooth_la_DEPENDENCIES = $(loc @SBC_TRUE@sbc_sbcdec_LDADD = sbc/libsbc.la @SBC_TRUE@sbc_sbcenc_SOURCES = sbc/sbcenc.c sbc/formats.h @SBC_TRUE@sbc_sbcenc_LDADD = sbc/libsbc.la diff --git a/package/bluez/patches/patch-ltmain_sh b/package/bluez/patches/patch-ltmain_sh new file mode 100644 index 000000000..e323f1b54 --- /dev/null +++ b/package/bluez/patches/patch-ltmain_sh @@ -0,0 +1,11 @@ +--- bluez-4.59.orig/ltmain.sh 2009-12-24 17:42:43.000000000 +0100 ++++ bluez-4.59/ltmain.sh 2011-01-14 19:25:00.000000000 +0100 +@@ -4765,7 +4765,7 @@ func_mode_link () + # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC + # @file GCC response files + -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) + func_quote_for_eval "$arg" + arg="$func_quote_for_eval_result" + func_append compile_command " $arg" diff --git a/package/bogofilter/Makefile b/package/bogofilter/Makefile index 4f83f73f4..0c8cca392 100644 --- a/package/bogofilter/Makefile +++ b/package/bogofilter/Makefile @@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= bogofilter PKG_VERSION:= 1.2.2 -PKG_RELEASE:= 1 +PKG_RELEASE:= 2 PKG_MD5SUM:= 39d27c13eae8a5064d68e20d585e60de PKG_DESCR:= mail filter PKG_SECTION:= mail @@ -14,8 +14,6 @@ PKG_BUILDDEP:= libiconv libdb PKG_URL:= http://bogofilter.sourceforge.net/ PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=bogofilter/} -PKG_HOST_DEPENDS:= !darwin - include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,BOGOFILTER,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) @@ -25,9 +23,13 @@ CONFIGURE_ENV+= LIBS="-liconv" \ CONFIGURE_ARGS+= --without-libsqlite3-prefix \ --without-libqdbm-prefix \ --with-included-gsl \ + --disable-static \ --with-libdb-prefix=${STAGING_TARGET_DIR}/usr \ --disable-transactions +pre-build: + touch $(WRKBUILD)/src/lexer_v3.l $(WRKBUILD)/src/Makefile.in $(WRKBUILD)/src/lexer_v3.c + post-install: ${INSTALL_DIR} ${IDIR_BOGOFILTER}/usr/bin ${INSTALL_BIN} ${WRKINST}/usr/bin/bogofilter \ 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/config/miscutils/Config.in b/package/busybox/config/miscutils/Config.in index e28539204..bb7fb2aa7 100644 --- a/package/busybox/config/miscutils/Config.in +++ b/package/busybox/config/miscutils/Config.in @@ -547,6 +547,17 @@ config BUSYBOX_READAHEAD As readahead(2) blocks until each file has been read, it is best to run this applet as a background job. +config BUSYBOX_RFKILL + bool "rfkill" + default y # doesn't build on Ubuntu 9.04 + help + Enable/disable wireless devices. + + rfkill list : list all wireless devices + rfkill list bluetooth : list all bluetooth devices + rfkill list 1 : list device corresponding to the given index + rfkill block|unblock wlan : block/unblock all wlan(wifi) devices + config BUSYBOX_RUNLEVEL bool "runlevel" default n 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/bzr/Makefile b/package/bzr/Makefile index ba8aba484..845ce4827 100644 --- a/package/bzr/Makefile +++ b/package/bzr/Makefile @@ -1,12 +1,12 @@ -# This file is part of the OpenADK project. OpenADK is copyrighted +# This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. include $(TOPDIR)/rules.mk PKG_NAME:= bzr -PKG_VERSION:= 2.3b3 +PKG_VERSION:= 2.3b4 PKG_RELEASE:= 1 -PKG_MD5SUM:= 94f9181b9a4ab84b94cfbc06bd5dfd91 +PKG_MD5SUM:= 62ba2dbd8b13745bc89e24dd4191cdc5 PKG_DESCR:= bazaar PKG_SECTION:= scm PKG_DEPENDS:= python2 @@ -25,11 +25,13 @@ INSTALL_STYLE:= manual include $(TOPDIR)/mk/python.mk do-build: - cd $(WRKBUILD); env PYTHONPATH=$(PYTHON_LIBDIR) $(PYTHON) ./setup.py install --prefix="$(WRKINST)/usr" + cd $(WRKBUILD); env PYTHONPATH=$(PYTHON_LIBDIR) $(PYTHON) ./setup.py install --prefix=$(WRKINST)/usr build_ext --allow-python-fallback do-install: + $(INSTALL_DIR) $(IDIR_BZR)/usr/lib/python$(PYTHON_VERSION)/site-packages + $(CP) $(WRKINST)/usr/lib/python$(PYTHON_VERSION)/site-packages/* \ + $(IDIR_BZR)/usr/lib/python$(PYTHON_VERSION)/site-packages $(INSTALL_DIR) $(IDIR_BZR)/usr/bin - $(INSTALL_BIN) $(WRKINST)/usr/bin/bzr \ - $(IDIR_BZR)/usr/bin + $(INSTALL_BIN) $(WRKINST)/usr/bin/bzr $(IDIR_BZR)/usr/bin include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/ca-certificates/Makefile b/package/ca-certificates/Makefile index 56ee67f15..60716f194 100644 --- a/package/ca-certificates/Makefile +++ b/package/ca-certificates/Makefile @@ -15,7 +15,7 @@ PKG_SITES:= http://ftp.debian.org/debian/pool/main/c/ca-certificates/ DISTFILES:= ${PKG_NAME}_${PKG_VERSION}.tar.gz -PKG_FLAVOURS:= SMALL +PKG_FLAVOURS_CA_CERTS:= SMALL PKGFD_SMALL:= Minimal set of CA certificates include $(TOPDIR)/mk/package.mk diff --git a/package/cairo/patches/patch-build_ltmain_sh b/package/cairo/patches/patch-build_ltmain_sh new file mode 100644 index 000000000..d79eba50b --- /dev/null +++ b/package/cairo/patches/patch-build_ltmain_sh @@ -0,0 +1,11 @@ +--- cairo-1.8.10.orig/build/ltmain.sh 2010-02-20 00:39:43.000000000 +0100 ++++ cairo-1.8.10/build/ltmain.sh 2011-01-14 20:17:40.000000000 +0100 +@@ -4765,7 +4765,7 @@ func_mode_link () + # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC + # @file GCC response files + -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) + func_quote_for_eval "$arg" + arg="$func_quote_for_eval_result" + func_append compile_command " $arg" diff --git a/package/cairo/patches/patch-src_cairo-features_h b/package/cairo/patches/patch-src_cairo-features_h new file mode 100644 index 000000000..6466deec7 --- /dev/null +++ b/package/cairo/patches/patch-src_cairo-features_h @@ -0,0 +1,15 @@ +--- cairo-1.8.10.orig/src/cairo-features.h 2010-02-19 22:34:38.000000000 +0100 ++++ cairo-1.8.10/src/cairo-features.h 2011-01-14 20:12:28.000000000 +0100 +@@ -10,11 +10,11 @@ + #define CAIRO_HAS_SVG_SURFACE 1 + #define CAIRO_HAS_USER_FONT 1 + #define CAIRO_HAS_XLIB_SURFACE 1 +-#define CAIRO_HAS_XLIB_XRENDER_SURFACE 1 + + /*#undef CAIRO_HAS_QUARTZ_FONT */ + /*#undef CAIRO_HAS_QUARTZ_SURFACE */ + /*#undef CAIRO_HAS_WIN32_FONT */ + /*#undef CAIRO_HAS_WIN32_SURFACE */ ++/*#undef CAIRO_HAS_XLIB_XRENDER_SURFACE */ + + #endif diff --git a/package/ccid/patches/patch-ltmain_sh b/package/ccid/patches/patch-ltmain_sh new file mode 100644 index 000000000..572c24069 --- /dev/null +++ b/package/ccid/patches/patch-ltmain_sh @@ -0,0 +1,11 @@ +--- ccid-1.4.1.orig/ltmain.sh 2010-08-04 15:28:29.000000000 +0200 ++++ ccid-1.4.1/ltmain.sh 2011-01-14 20:22:38.000000000 +0100 +@@ -4765,7 +4765,7 @@ func_mode_link () + # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC + # @file GCC response files + -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) + func_quote_for_eval "$arg" + arg="$func_quote_for_eval_result" + func_append compile_command " $arg" diff --git a/package/cgilib/patches/patch-ltmain_sh b/package/cgilib/patches/patch-ltmain_sh index 6eceb3560..f2e06e38b 100644 --- a/package/cgilib/patches/patch-ltmain_sh +++ b/package/cgilib/patches/patch-ltmain_sh @@ -1,6 +1,6 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $ --- cgilib-0.7.orig/ltmain.sh 2008-04-29 23:33:55.000000000 +0200 -+++ cgilib-0.7/ltmain.sh 2009-05-09 03:58:09.000000000 +0200 ++++ cgilib-0.7/ltmain.sh 2011-01-14 20:26:24.000000000 +0100 @@ -43,8 +43,8 @@ EXIT_FAILURE=1 PROGRAM=ltmain.sh @@ -65,6 +65,15 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $ continue ;; +@@ -1676,7 +1706,7 @@ EOF + # -F/path gives path to uninstalled frameworks, gcc on darwin + # @file GCC response files + -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) + + # Unknown arguments in both finalize_command and compile_command need + # to be aesthetically quoted because they are evaled later. @@ -2135,10 +2165,7 @@ EOF case $pass in dlopen) libs="$dlfiles" ;; diff --git a/package/collectd/Makefile b/package/collectd/Makefile index 52e6e6ab5..277e061cf 100644 --- a/package/collectd/Makefile +++ b/package/collectd/Makefile @@ -13,26 +13,26 @@ PKG_DEPENDS:= libpthread PKG_URL:= http://collectd.org/ PKG_SITES:= http://collectd.org/files/ -PKG_FLAVOURS:= CPU LOAD MEMORY PING -PKGFD_CPU:= collect CPU statistics -PKGFD_LOAD:= collect system load statistics -PKGFD_MEMORY:= collect memory usage statistics -PKGFD_PING:= enable ping statistic plugin +PKG_FLAVOURS_COLLECD:= WITH_CPU WITH_LOAD WITH_MEMORY WITH_PING +PKGFD_WITH_CPU:= collect CPU statistics +PKGFD_WITH_LOAD:= collect system load statistics +PKGFD_WITH_MEMORY:= collect memory usage statistics +PKGFD_WITH_PING:= enable ping statistic plugin include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,COLLECTD,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -ifneq (${ADK_PACKAGE_COLLECTD_CPU},y) +ifneq (${ADK_PACKAGE_COLLECTD_WITH_CPU},y) DISABLE_CPU:=--disable-cpu endif -ifneq (${ADK_PACKAGE_COLLECTD_LOAD},y) +ifneq (${ADK_PACKAGE_COLLECTD_WITH_LOAD},y) DISABLE_LOAD:=--disable-load endif -ifneq (${ADK_PACKAGE_COLLECTD_MEMORY},y) +ifneq (${ADK_PACKAGE_COLLECTD_WITH_MEMORY},y) DISABLE_MEMORY:=--disable-memory endif -ifneq (${ADK_PACKAGE_COLLECTD_PING},y) +ifneq (${ADK_PACKAGE_COLLECTD_WITH_PING},y) DISABLE_PING:=--disable-ping endif diff --git a/package/collectd/patches/patch-ltmain_sh b/package/collectd/patches/patch-ltmain_sh new file mode 100644 index 000000000..d53645853 --- /dev/null +++ b/package/collectd/patches/patch-ltmain_sh @@ -0,0 +1,11 @@ +--- collectd-4.10.0.orig/ltmain.sh 2010-05-01 11:15:57.000000000 +0200 ++++ collectd-4.10.0/ltmain.sh 2011-01-14 20:29:06.000000000 +0100 +@@ -4765,7 +4765,7 @@ func_mode_link () + # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC + # @file GCC response files + -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) + func_quote_for_eval "$arg" + arg="$func_quote_for_eval_result" + func_append compile_command " $arg" 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/cryptsetup/Makefile b/package/cryptsetup/Makefile index fbccefdfe..8ab2f397d 100644 --- a/package/cryptsetup/Makefile +++ b/package/cryptsetup/Makefile @@ -24,7 +24,8 @@ include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,CRYPTSETUP,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -CONFIGURE_ARGS+= --disable-selinux +CONFIGURE_ARGS+= --disable-selinux \ + --disable-static post-install: ${INSTALL_DIR} ${IDIR_CRYPTSETUP}/usr/sbin ${IDIR_CRYPTSETUP}/usr/lib diff --git a/package/cryptsetup/patches/patch-ltmain_sh b/package/cryptsetup/patches/patch-ltmain_sh new file mode 100644 index 000000000..4aa161aec --- /dev/null +++ b/package/cryptsetup/patches/patch-ltmain_sh @@ -0,0 +1,11 @@ +--- cryptsetup-1.1.3.orig/ltmain.sh 2010-01-17 11:29:15.000000000 +0100 ++++ cryptsetup-1.1.3/ltmain.sh 2011-01-14 20:48:34.000000000 +0100 +@@ -4765,7 +4765,7 @@ func_mode_link () + # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC + # @file GCC response files + -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) + func_quote_for_eval "$arg" + arg="$func_quote_for_eval_result" + func_append compile_command " $arg" diff --git a/package/cups/Makefile b/package/cups/Makefile index 8f764ba1b..aa3bea6fd 100644 --- a/package/cups/Makefile +++ b/package/cups/Makefile @@ -21,7 +21,7 @@ include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,CUPS,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) CONFIGURE_ENV+= ac_cv_func_sigset=no \ - OPTIM='-fPIC' + OPTIM='-fPIC $(TARGET_CFLAGS)' CONFIGURE_ARGS+= --with-cups-user=cups \ --with-cups-group=cups \ @@ -42,7 +42,7 @@ CONFIGURE_ARGS+= --with-cups-user=cups \ --disable-ssl FAKE_FLAGS+= DSTROOT="${WRKINST}" STRIP="/bin/true" -XAKE_FLAGS+= OPTIM='-fPIC' +XAKE_FLAGS+= OPTIM='-fPIC $(TARGET_CFLAGS)' post-install: ${INSTALL_DIR} ${IDIR_CUPS}/usr/bin diff --git a/package/curl/Makefile b/package/curl/Makefile index ab6e45416..4e1dd6bf5 100644 --- a/package/curl/Makefile +++ b/package/curl/Makefile @@ -21,7 +21,7 @@ PKGSS_LIBCURL:= libopenssl zlib PKGSD_LIBCURL_DEV:= development files for libcurl PKGSC_LIBCURL_DEV:= devel -PKG_FLAVOURS:= WITH_IPV6 +PKG_FLAVOURS_CURL:= WITH_IPV6 PKGFD_WITH_IPV6:= enable IPv6 support include ${TOPDIR}/mk/package.mk @@ -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,14 +58,14 @@ else CONFIGURE_ARGS+= --disable-ipv6 endif -post-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y} - ${INSTALL_DIR} ${IDIR_LIBCURL}/usr/lib - ${CP} ${WRKINST}/usr/lib/libcurl.so* ${IDIR_LIBCURL}/usr/lib/ - curl-install: ${INSTALL_DIR} ${IDIR_CURL}/usr/bin ${INSTALL_BIN} ${WRKINST}/usr/bin/curl ${IDIR_CURL}/usr/bin/ +libcurl-install: + ${INSTALL_DIR} ${IDIR_LIBCURL}/usr/lib + ${CP} ${WRKINST}/usr/lib/libcurl.so* ${IDIR_LIBCURL}/usr/lib/ + libcurl-dev-install: ${INSTALL_DIR} ${IDIR_LIBCURL_DEV}/usr/include/curl ${CP} ${WRKINST}/usr/include/curl/*.h \ diff --git a/package/curl/patches/patch-configure b/package/curl/patches/patch-configure index 21c0b095d..27e43ebf0 100644 --- a/package/curl/patches/patch-configure +++ b/package/curl/patches/patch-configure @@ -1,6 +1,6 @@ ---- curl-7.19.7.orig/configure 2009-11-04 13:26:02.000000000 +0100 -+++ curl-7.19.7/configure 2009-12-03 21:07:01.000000000 +0100 -@@ -19233,15 +19233,6 @@ fi +--- curl-7.21.0.orig/configure 2010-06-05 00:32:04.000000000 +0200 ++++ curl-7.21.0/configure 2011-01-14 12:05:38.000000000 +0100 +@@ -19714,15 +19714,6 @@ fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi diff --git a/package/curl/patches/patch-ltmain_sh b/package/curl/patches/patch-ltmain_sh new file mode 100644 index 000000000..b1eef4628 --- /dev/null +++ b/package/curl/patches/patch-ltmain_sh @@ -0,0 +1,11 @@ +--- curl-7.21.0.orig/ltmain.sh 2010-05-27 21:20:16.000000000 +0200 ++++ curl-7.21.0/ltmain.sh 2011-01-14 12:07:25.000000000 +0100 +@@ -4765,7 +4765,7 @@ func_mode_link () + # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC + # @file GCC response files + -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) + func_quote_for_eval "$arg" + arg="$func_quote_for_eval_result" + func_append compile_command " $arg" diff --git a/package/dansguardian/Makefile b/package/dansguardian/Makefile index 5cc1d08e5..b24b416b7 100644 --- a/package/dansguardian/Makefile +++ b/package/dansguardian/Makefile @@ -13,18 +13,25 @@ PKG_DEPENDS:= libpcre zlib PKG_BUILDDEP:= pcre zlib PKG_URL:= http://dansguardian.org/ PKG_SITES:= http://dansguardian.org/downloads/2/Stable/ +PKG_NEED_CXX:= 1 PKG_CXX:= DANSGUARDIAN include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,DANSGUARDIAN,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +LIBRARIES:=-nodefaultlibs -luClibc++ -lgcc -lm +ifeq ($(ADK_TOOLCHAIN_GCC_USE_SSP),y) +LIBRARIES+=-lssp +endif + ifeq ($(ADK_COMPILE_DANSGUARDIAN_WITH_UCLIBCXX),y) CONFIGURE_ENV+= CXXFLAGS="-fno-threadsafe-statics -fno-builtin -nostdinc++ \ -I${STAGING_TARGET_DIR}/usr/include/uClibc++" \ - LIBS="-nodefaultlibs -luClibc++ -lgcc -lm" + LIBS="$(LIBRARIES)" endif + CONFIGURE_ARGS+= --enable-orig-ip \ --with-proxyuser=proxy \ --with-proxygroup=proxy diff --git a/package/dbus/patches/patch-configure b/package/dbus/patches/patch-configure index f33a192a9..18acacbc8 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-14 19:21:37.000000000 +0100 +@@ -25294,19 +25294,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..c594b88f2 --- /dev/null +++ b/package/dbus/patches/patch-ltmain_sh @@ -0,0 +1,39 @@ +--- dbus-1.2.24.orig/ltmain.sh 2010-03-12 23:22:29.000000000 +0100 ++++ dbus-1.2.24/ltmain.sh 2011-01-14 19:22:39.000000000 +0100 +@@ -4765,7 +4765,7 @@ func_mode_link () + # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC + # @file GCC response files + -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) + func_quote_for_eval "$arg" + arg="$func_quote_for_eval_result" + func_append compile_command " $arg" +@@ -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/digitemp/patches/patch-Makefile b/package/digitemp/patches/patch-Makefile index 4f19aaae2..95b89e7b3 100644 --- a/package/digitemp/patches/patch-Makefile +++ b/package/digitemp/patches/patch-Makefile @@ -1,7 +1,7 @@ do not use static linking on Cygwin --- digitemp-3.6.0.orig/Makefile 2008-08-28 23:37:00.000000000 +0200 -+++ digitemp-3.6.0/Makefile 2010-01-06 19:12:56.868375000 +0100 -@@ -11,8 +11,8 @@ ++++ digitemp-3.6.0/Makefile 2011-01-14 21:37:33.000000000 +0100 +@@ -11,8 +11,9 @@ VERSION = 3.6.0 @@ -9,10 +9,20 @@ do not use static linking on Cygwin -CFLAGS = -I./src -I./userial -O2 -Wall # -g +CC ?= gcc +CFLAGS ?= -I./src -I./userial ++LDFLAGS ?= OBJS = src/digitemp.o src/device_name.o src/ds2438.o HDRS = src/digitemp.h src/device_name.h -@@ -57,7 +57,6 @@ endif +@@ -45,7 +46,7 @@ DS2490OBJS = userial/ds2490/ownet.o user + # If you add a new OSTYPE here please email it to me so that I can add + # it to the distribution in the next release + # ----------------------------------------------------------------------- +-SYSTYPE := $(shell uname -s) ++SYSTYPE := Linux + + ifeq ($(SYSTYPE), Linux) + CFLAGS += -DLINUX +@@ -57,7 +58,6 @@ endif ifneq (, $(findstring CYGWIN,$(SYSTYPE))) CFLAGS += -DCYGWIN @@ -20,3 +30,20 @@ do not use static linking on Cygwin endif ifeq ($(SYSTYPE), SunOS) +@@ -116,13 +116,13 @@ all: help + + # Build the Linux executable + ds9097: $(OBJS) $(HDRS) $(ONEWIREOBJS) $(ONEWIREHDRS) $(DS9097OBJS) +- $(CC) $(OBJS) $(ONEWIREOBJS) $(DS9097OBJS) -o digitemp_DS9097 $(LIBS) ++ $(CC) $(LDFLAGS) $(OBJS) $(ONEWIREOBJS) $(DS9097OBJS) -o digitemp_DS9097 $(LIBS) + + ds9097u: $(OBJS) $(HDRS) $(ONEWIREOBJS) $(ONEWIREHDRS) $(DS9097UOBJS) +- $(CC) $(OBJS) $(ONEWIREOBJS) $(DS9097UOBJS) -o digitemp_DS9097U $(LIBS) ++ $(CC) $(LDFLAGS) $(OBJS) $(ONEWIREOBJS) $(DS9097UOBJS) -o digitemp_DS9097U $(LIBS) + + ds2490: $(OBJS) $(HDRS) $(ONEWIREOBJS) $(ONEWIREHDRS) $(DS2490OBJS) +- $(CC) $(OBJS) $(ONEWIREOBJS) $(DS2490OBJS) -o digitemp_DS2490 $(LIBS) ++ $(CC) $(LDFLAGS) $(OBJS) $(ONEWIREOBJS) $(DS2490OBJS) -o digitemp_DS2490 $(LIBS) + + + # Clean up the object files and the sub-directory for distributions 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/dovecot/Makefile b/package/dovecot/Makefile index 0716059b0..395a2c70c 100644 --- a/package/dovecot/Makefile +++ b/package/dovecot/Makefile @@ -12,7 +12,7 @@ PKG_SECTION:= mail PKG_URL:= http://www.dovecot.org/ PKG_SITES:= http://www.dovecot.org/releases/2.0/ -PKG_CHOICES:= WITH_OPENSSL WITH_GNUTLS +PKG_CHOICES_DOVECOT:= WITH_OPENSSL WITH_GNUTLS PKGCD_WITH_OPENSSL:= use OpenSSL for crypto PKGCS_WITH_OPENSSL:= libopenssl PKGCB_WITH_OPENSSL:= openssl diff --git a/package/dovecot/patches/patch-ltmain_sh b/package/dovecot/patches/patch-ltmain_sh new file mode 100644 index 000000000..8c7c6bc7d --- /dev/null +++ b/package/dovecot/patches/patch-ltmain_sh @@ -0,0 +1,11 @@ +--- dovecot-2.0.5.orig/ltmain.sh 2010-05-24 16:48:06.000000000 +0200 ++++ dovecot-2.0.5/ltmain.sh 2011-01-14 22:05:48.000000000 +0100 +@@ -4765,7 +4765,7 @@ func_mode_link () + # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC + # @file GCC response files + -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) + func_quote_for_eval "$arg" + arg="$func_quote_for_eval_result" + func_append compile_command " $arg" diff --git a/package/drbd/patches/patch-drbd_drbd_buildtag_c b/package/drbd/patches/patch-drbd_drbd_buildtag_c deleted file mode 100644 index 7a8358ea7..000000000 --- a/package/drbd/patches/patch-drbd_drbd_buildtag_c +++ /dev/null @@ -1,9 +0,0 @@ ---- drbd-8.3.8.1.orig/drbd/drbd_buildtag.c 2010-07-09 10:19:05.000000000 +0200 -+++ drbd-8.3.8.1/drbd/drbd_buildtag.c 2010-11-26 18:59:58.000000000 +0100 -@@ -3,5 +3,5 @@ - const char *drbd_buildtag(void) - { - return "GIT-hash: 0d8589fcc32c874df57c930ca1691399b55ec893" -- " build by lars@soda, 2010-07-09 10:19:24"; -+ " build by wbx@neon.lan, 2010-11-26 18:59:58"; - } diff --git a/package/drbd/patches/patch-user_Makefile_in b/package/drbd/patches/patch-user_Makefile_in new file mode 100644 index 000000000..2979decb1 --- /dev/null +++ b/package/drbd/patches/patch-user_Makefile_in @@ -0,0 +1,24 @@ +--- drbd-8.3.8.1.orig/user/Makefile.in 2010-05-10 16:09:13.000000000 +0200 ++++ drbd-8.3.8.1/user/Makefile.in 2011-01-14 22:16:28.000000000 +0100 +@@ -74,7 +74,7 @@ drbd_strings.c: ../drbd/drbd_strings.c + cp $^ $@ + + drbdadm: $(drbdadm-obj) +- $(CC) -o $@ $^ ++ $(CC) $(LDFLAGS) -o $@ $^ + + drbdadm_scanner.c: drbdadm_scanner.fl drbdadm_parser.h + flex -s -odrbdadm_scanner.c drbdadm_scanner.fl +@@ -83,10 +83,10 @@ drbdmeta_scanner.c: drbdmeta_scanner.fl + flex -s -odrbdmeta_scanner.c drbdmeta_scanner.fl + + drbdsetup: $(drbdsetup-obj) +- $(CC) -o $@ $^ ++ $(CC) $(LDFLAGS) -o $@ $^ + + drbdmeta: $(drbdmeta-obj) +- $(CC) -o $@ $^ ++ $(CC) $(LDFLAGS) -o $@ $^ + + clean: + rm -f drbdadm_scanner.c drbdmeta_scanner.c diff --git a/package/e2fsprogs/Makefile b/package/e2fsprogs/Makefile index 1eb65d222..7b22a922d 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 @@ -15,7 +15,7 @@ PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=e2fsprogs/} PKG_CFLINE_E2FSPROGS:= default y if ADK_TARGET_ROOTFS_CF -PKG_SUBPKGS:= E2FSPROGS LIBUUID LIBCOM_ERR LIBSS LIBBLKID +PKG_SUBPKGS:= E2FSPROGS LIBUUID LIBCOM_ERR LIBSS LIBBLKID E2FSCK_STATIC PKGSD_LIBUUID:= UUID library PKGSC_LIBUUID:= libs PKGSD_LIBCOM_ERR:= Common error library @@ -24,6 +24,8 @@ PKGSD_LIBSS:= Subsystem command parsing library PKGSC_LIBSS:= libs PKGSD_LIBBLKID:= Libblkid PKGSC_LIBBLKID:= libs +PKGSD_E2FSCK_STATIC:= Static build of e2fsck +PKGSC_E2FSCK_STATIC:= fs include ${TOPDIR}/mk/package.mk @@ -32,9 +34,11 @@ $(eval $(call PKG_template,LIBUUID,libuuid,${PKG_VERSION}-${PKG_RELEASE},,${PKGS $(eval $(call PKG_template,LIBCOM_ERR,libcom-err,${PKG_VERSION}-${PKG_RELEASE},,${PKGSD_LIBCOM_ERR},${PKGSC_LIBCOM_ERR})) $(eval $(call PKG_template,LIBSS,libss,${PKG_VERSION}-${PKG_RELEASE},,${PKGSD_LIBSS},${PKGSC_LIBSS})) $(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+= -lpthread pre-build: ${MAKE} -C ${WRKBUILD}/util \ @@ -44,7 +48,14 @@ pre-build: CPPFLAGS="" \ subst +post-build: + ${MAKE} -C ${WRKBUILD}/e2fsck e2fsck.static + ${INSTALL_DIR} ${WRKINST}/usr/sbin + ${INSTALL_BIN} ${WRKBUILD}/e2fsck/e2fsck.static ${WRKINST}/usr/sbin/ + post-install: + ${INSTALL_DIR} ${IDIR_E2FSPROGS}/etc + ${INSTALL_DATA} ${WRKINST}/etc/mke2fs.conf ${IDIR_E2FSPROGS}/etc/ ${INSTALL_DIR} ${IDIR_E2FSPROGS}/usr/lib ${IDIR_E2FSPROGS}/usr/sbin ${INSTALL_BIN} ${WRKINST}/usr/sbin/e2fsck ${IDIR_E2FSPROGS}/usr/sbin/ cd $(IDIR_E2FSPROGS)/usr/sbin && ln -sf e2fsck fsck.ext2 @@ -73,5 +84,8 @@ post-install: ${CP} ${WRKBUILD}/lib/uuid/uuid.h \ ${STAGING_TARGET_DIR}/usr/include/uuid ${CP} ${WRKINST}/usr/bin/compile_et ${STAGING_HOST_DIR}/bin + ${INSTALL_DIR} ${IDIR_E2FSCK_STATIC}/usr/sbin + ${INSTALL_BIN} ${WRKINST}/usr/sbin/e2fsck.static \ + ${IDIR_E2FSCK_STATIC}/usr/sbin/e2fsck include ${TOPDIR}/mk/pkg-bottom.mk 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..ac7dc5e86 --- /dev/null +++ b/package/e2fsprogs/patches/patch-e2fsck_Makefile_in @@ -0,0 +1,20 @@ +--- 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-11 00:34:19.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) + +@@ -119,7 +119,7 @@ e2fsck: $(OBJS) $(DEPLIBS) + + e2fsck.static: $(OBJS) $(STATIC_DEPLIBS) + $(E) " LD $@" +- $(Q) $(LD) $(LDFLAGS_STATIC) -o e2fsck.static $(OBJS) $(STATIC_LIBS) ++ $(LD) $(LDFLAGS_STATIC) -o e2fsck.static $(OBJS) $(STATIC_LIBS) + + e2fsck.profiled: $(PROFILED_OBJS) $(PROFILED_DEPLIBS) + $(E) " LD $@" 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/e2fsprogs/patches/patch-misc_e2undo_c b/package/e2fsprogs/patches/patch-misc_e2undo_c new file mode 100644 index 000000000..2d1441220 --- /dev/null +++ b/package/e2fsprogs/patches/patch-misc_e2undo_c @@ -0,0 +1,11 @@ + optind seems to need unistd.h, not only getopt.h +--- e2fsprogs-1.41.12.orig/misc/e2undo.c 2010-05-14 00:59:49.000000000 +0200 ++++ e2fsprogs-1.41.12/misc/e2undo.c 2010-10-18 12:03:49.329511558 +0200 +@@ -19,6 +19,7 @@ + #if HAVE_ERRNO_H + #include <errno.h> + #endif ++#include <unistd.h> + #include "ext2fs/tdb.h" + #include "ext2fs/ext2fs.h" + #include "nls-enable.h" diff --git a/package/ebtables/patches/patch-Makefile b/package/ebtables/patches/patch-Makefile index 62528ec30..f05da74c9 100644 --- a/package/ebtables/patches/patch-Makefile +++ b/package/ebtables/patches/patch-Makefile @@ -1,6 +1,6 @@ --- ebtables-v2.0.9-1.orig/Makefile 2009-06-21 15:13:25.000000000 +0200 -+++ ebtables-v2.0.9-1/Makefile 2009-11-29 15:39:30.000000000 +0100 -@@ -8,17 +8,16 @@ PROGDATE:=June\ 2009 ++++ ebtables-v2.0.9-1/Makefile 2011-01-14 22:24:16.000000000 +0100 +@@ -8,17 +8,17 @@ PROGDATE:=June\ 2009 # default paths LIBDIR:=/usr/lib @@ -16,6 +16,7 @@ -CFLAGS:=-Wall -Wunused +CFLAGS?=-Wall -Wunused ++LDFLAGS?= CFLAGS_SH_LIB:=-fPIC -CC:=gcc -LD:=ld @@ -23,16 +24,25 @@ ifeq ($(shell uname -m),sparc64) CFLAGS+=-DEBT_MIN_ALIGN=8 -DKERNEL_64_USERSPACE_32 -@@ -85,7 +84,7 @@ ebtables-standalone.o: ebtables-standalo +@@ -85,14 +85,14 @@ ebtables-standalone.o: ebtables-standalo .PHONY: libebtc libebtc: $(OBJECTS2) - $(LD) -shared -soname libebtc.so -o libebtc.so -lc $(OBJECTS2) -+ $(CC) -shared -o libebtc.so -lc $(OBJECTS2) ++ $(CC) -shared $(LDFLAGS) -o libebtc.so -lc $(OBJECTS2) ebtables: $(OBJECTS) ebtables-standalone.o libebtc - $(CC) $(CFLAGS) $(CFLAGS_SH_LIB) -o $@ ebtables-standalone.o -I$(KERNEL_INCLUDES) -L. -Lextensions -lebtc $(EXT_LIBSI) \ -@@ -154,28 +153,29 @@ tmp3:=$(shell printf $(PIPE) | sed 's/\/ +- $(CC) $(CFLAGS) $(CFLAGS_SH_LIB) -o $@ ebtables-standalone.o -I$(KERNEL_INCLUDES) -L. -Lextensions -lebtc $(EXT_LIBSI) \ ++ $(CC) $(LDFLAGS) $(CFLAGS) $(CFLAGS_SH_LIB) -o $@ ebtables-standalone.o -I$(KERNEL_INCLUDES) -L. -Lextensions -lebtc $(EXT_LIBSI) \ + -Wl,-rpath,$(LIBDIR) + + ebtablesu: ebtablesu.c +- $(CC) $(CFLAGS) $(PROGSPECSD) $< -o $@ ++ $(CC) $(LDFLAGS) $(CFLAGS) $(PROGSPECSD) $< -o $@ + + ebtablesd.o: ebtablesd.c include/ebtables_u.h + $(CC) $(CFLAGS) $(PROGSPECSD) -c $< -o $@ -I$(KERNEL_INCLUDES) +@@ -154,28 +154,29 @@ tmp3:=$(shell printf $(PIPE) | sed 's/\/ .PHONY: scripts scripts: ebtables-save ebtables.sysv ebtables-config cat ebtables-save | sed 's/__EXEC_PATH__/$(tmp1)/g' > ebtables-save_ @@ -69,7 +79,7 @@ .PHONY: install install: $(MANDIR)/man8/ebtables.8 $(ETHERTYPESFILE) exec scripts -@@ -199,18 +199,18 @@ release: +@@ -199,18 +200,18 @@ release: rm -f extensions/ebt_inat.c rm -rf $(CVSDIRS) mkdir -p include/linux/netfilter_bridge 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/elinks/Makefile b/package/elinks/Makefile index ec7180d93..fe863ec55 100644 --- a/package/elinks/Makefile +++ b/package/elinks/Makefile @@ -15,7 +15,7 @@ PKG_URL:= http://elinks.or.cz/ PKG_SITES:= http://elinks.or.cz/download/ PKG_NOPARALLEL:= 1 -PKG_FLAVOURS:= WITH_IPV6 +PKG_FLAVOURS_ELINKS:= WITH_IPV6 PKGFD_WITH_IPV6:= enable IPv6 support include ${TOPDIR}/mk/package.mk @@ -23,7 +23,6 @@ include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,ELINKS,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) INSTALL_STYLE:= manual - TCFLAGS+= -fPIC CONFIGURE_ENV+= $(shell echo ac_cv_file_./features.conf | tr [:blank:]-/. _)=yes CONFIGURE_ENV+= $(shell echo ac_cv_file_${WRKBUILD}/features.conf | tr [:blank:]-/. _)=yes diff --git a/package/esound/patches/patch-esd_c b/package/esound/patches/patch-esd_c index ebec477a1..2af302a63 100644 --- a/package/esound/patches/patch-esd_c +++ b/package/esound/patches/patch-esd_c @@ -2,9 +2,9 @@ $Id$ cast to double, to avoid sinf, patch from Sven Gugges ---- esound-0.2.38.orig/esd.c 2007-05-03 22:28:35.000000000 +0200 -+++ esound-0.2.38/esd.c 2007-05-19 17:21:23.000000000 +0200 -@@ -131,14 +131,14 @@ void set_audio_buffer( void *buf, esd_fo +--- esound-0.2.41.orig/esd.c 2008-11-18 21:35:19.000000000 +0100 ++++ esound-0.2.41/esd.c 2011-01-14 23:15:33.000000000 +0100 +@@ -134,14 +134,14 @@ void set_audio_buffer( void *buf, esd_fo { case ESD_BITS8: for ( i = 0 ; i < length ; i+=2 ) { diff --git a/package/esound/patches/patch-ltmain_sh b/package/esound/patches/patch-ltmain_sh new file mode 100644 index 000000000..316c61433 --- /dev/null +++ b/package/esound/patches/patch-ltmain_sh @@ -0,0 +1,11 @@ +--- esound-0.2.41.orig/ltmain.sh 2008-06-06 20:28:34.000000000 +0200 ++++ esound-0.2.41/ltmain.sh 2011-01-14 23:16:51.000000000 +0100 +@@ -1676,7 +1676,7 @@ EOF + # -F/path gives path to uninstalled frameworks, gcc on darwin + # @file GCC response files + -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) + + # Unknown arguments in both finalize_command and compile_command need + # to be aesthetically quoted because they are evaled later. diff --git a/package/exmap/Makefile b/package/exmap/Makefile index 536249af9..9b3c57740 100644 --- a/package/exmap/Makefile +++ b/package/exmap/Makefile @@ -33,6 +33,7 @@ CONFIGURE_ARGS+= --disable-doc CONFIGURE_ENV+= LIBS="-lncurses" pre-build: + GCC_HONOUR_COPTS=s \ KERNEL_PATH=${LINUX_DIR} \ CROSS_COMPILE="${TARGET_CROSS}" \ V=1 ARCH="${ARCH}" KERNELVERSION="2.6" \ diff --git a/package/exmap/patches/autotool.patch b/package/exmap/patches/autotool.patch new file mode 100644 index 000000000..73ae711f4 --- /dev/null +++ b/package/exmap/patches/autotool.patch @@ -0,0 +1,11256 @@ +diff -Nur exmap-console-0.4.1.orig/INSTALL exmap-console-0.4.1/INSTALL +--- exmap-console-0.4.1.orig/INSTALL 2006-11-03 09:36:03.000000000 +0100 ++++ exmap-console-0.4.1/INSTALL 2011-01-11 12:44:16.000000000 +0100 +@@ -1,16 +1,25 @@ + Installation Instructions + ************************* + +-Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005 Free +-Software Foundation, Inc. ++Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005, ++2006, 2007, 2008, 2009 Free Software Foundation, Inc. + +-This file is free documentation; the Free Software Foundation gives +-unlimited permission to copy, distribute and modify it. ++ Copying and distribution of this file, with or without modification, ++are permitted in any medium without royalty provided the copyright ++notice and this notice are preserved. This file is offered as-is, ++without warranty of any kind. + + Basic Installation + ================== + +-These are generic installation instructions. ++ Briefly, the shell commands `./configure; make; make install' should ++configure, build, and install this package. The following ++more-detailed instructions are generic; see the `README' file for ++instructions specific to this package. Some packages provide this ++`INSTALL' file but do not implement all of the features documented ++below. The lack of an optional feature in a given package is not ++necessarily a bug. More recommendations for GNU packages can be found ++in *note Makefile Conventions: (standards)Makefile Conventions. + + The `configure' shell script attempts to guess correct values for + various system-dependent variables used during compilation. It uses +@@ -23,9 +32,9 @@ + + It can also use an optional file (typically called `config.cache' + and enabled with `--cache-file=config.cache' or simply `-C') that saves +-the results of its tests to speed up reconfiguring. (Caching is ++the results of its tests to speed up reconfiguring. Caching is + disabled by default to prevent problems with accidental use of stale +-cache files.) ++cache files. + + If you need to do unusual things to compile the package, please try + to figure out how `configure' could check whether to do them, and mail +@@ -35,30 +44,37 @@ + may remove or edit it. + + The file `configure.ac' (or `configure.in') is used to create +-`configure' by a program called `autoconf'. You only need +-`configure.ac' if you want to change it or regenerate `configure' using +-a newer version of `autoconf'. ++`configure' by a program called `autoconf'. You need `configure.ac' if ++you want to change it or regenerate `configure' using a newer version ++of `autoconf'. + +-The simplest way to compile this package is: ++ The simplest way to compile this package is: + + 1. `cd' to the directory containing the package's source code and type +- `./configure' to configure the package for your system. If you're +- using `csh' on an old version of System V, you might need to type +- `sh ./configure' instead to prevent `csh' from trying to execute +- `configure' itself. ++ `./configure' to configure the package for your system. + +- Running `configure' takes awhile. While running, it prints some +- messages telling which features it is checking for. ++ Running `configure' might take a while. While running, it prints ++ some messages telling which features it is checking for. + + 2. Type `make' to compile the package. + + 3. Optionally, type `make check' to run any self-tests that come with +- the package. ++ the package, generally using the just-built uninstalled binaries. + + 4. Type `make install' to install the programs and any data files and +- documentation. ++ documentation. When installing into a prefix owned by root, it is ++ recommended that the package be configured and built as a regular ++ user, and only the `make install' phase executed with root ++ privileges. ++ ++ 5. Optionally, type `make installcheck' to repeat any self-tests, but ++ this time using the binaries in their final installed location. ++ This target does not install anything. Running this target as a ++ regular user, particularly if the prior `make install' required ++ root privileges, verifies that the installation completed ++ correctly. + +- 5. You can remove the program binaries and object files from the ++ 6. You can remove the program binaries and object files from the + source code directory by typing `make clean'. To also remove the + files that `configure' created (so you can compile the package for + a different kind of computer), type `make distclean'. There is +@@ -67,45 +83,69 @@ + all sorts of other programs in order to regenerate files that came + with the distribution. + ++ 7. Often, you can also type `make uninstall' to remove the installed ++ files again. In practice, not all packages have tested that ++ uninstallation works correctly, even though it is required by the ++ GNU Coding Standards. ++ ++ 8. Some packages, particularly those that use Automake, provide `make ++ distcheck', which can by used by developers to test that all other ++ targets like `make install' and `make uninstall' work correctly. ++ This target is generally not run by end users. ++ + Compilers and Options + ===================== + +-Some systems require unusual options for compilation or linking that the +-`configure' script does not know about. Run `./configure --help' for +-details on some of the pertinent environment variables. ++ Some systems require unusual options for compilation or linking that ++the `configure' script does not know about. Run `./configure --help' ++for details on some of the pertinent environment variables. + + You can give `configure' initial values for configuration parameters + by setting variables in the command line or in the environment. Here + is an example: + +- ./configure CC=c89 CFLAGS=-O2 LIBS=-lposix ++ ./configure CC=c99 CFLAGS=-g LIBS=-lposix + + *Note Defining Variables::, for more details. + + Compiling For Multiple Architectures + ==================================== + +-You can compile the package for more than one kind of computer at the ++ You can compile the package for more than one kind of computer at the + same time, by placing the object files for each architecture in their +-own directory. To do this, you must use a version of `make' that +-supports the `VPATH' variable, such as GNU `make'. `cd' to the ++own directory. To do this, you can use GNU `make'. `cd' to the + directory where you want the object files and executables to go and run + the `configure' script. `configure' automatically checks for the +-source code in the directory that `configure' is in and in `..'. ++source code in the directory that `configure' is in and in `..'. This ++is known as a "VPATH" build. + +- If you have to use a `make' that does not support the `VPATH' +-variable, you have to compile the package for one architecture at a +-time in the source code directory. After you have installed the +-package for one architecture, use `make distclean' before reconfiguring +-for another architecture. ++ With a non-GNU `make', it is safer to compile the package for one ++architecture at a time in the source code directory. After you have ++installed the package for one architecture, use `make distclean' before ++reconfiguring for another architecture. ++ ++ On MacOS X 10.5 and later systems, you can create libraries and ++executables that work on multiple system types--known as "fat" or ++"universal" binaries--by specifying multiple `-arch' options to the ++compiler but only a single `-arch' option to the preprocessor. Like ++this: ++ ++ ./configure CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" \ ++ CXX="g++ -arch i386 -arch x86_64 -arch ppc -arch ppc64" \ ++ CPP="gcc -E" CXXCPP="g++ -E" ++ ++ This is not guaranteed to produce working output in all cases, you ++may have to build one architecture at a time and combine the results ++using the `lipo' tool if you have problems. + + Installation Names + ================== + +-By default, `make install' installs the package's commands under ++ By default, `make install' installs the package's commands under + `/usr/local/bin', include files under `/usr/local/include', etc. You + can specify an installation prefix other than `/usr/local' by giving +-`configure' the option `--prefix=PREFIX'. ++`configure' the option `--prefix=PREFIX', where PREFIX must be an ++absolute file name. + + You can specify separate installation prefixes for + architecture-specific files and architecture-independent files. If you +@@ -116,16 +156,47 @@ + In addition, if you use an unusual directory layout you can give + options like `--bindir=DIR' to specify different values for particular + kinds of files. Run `configure --help' for a list of the directories +-you can set and what kinds of files go in them. ++you can set and what kinds of files go in them. In general, the ++default for these options is expressed in terms of `${prefix}', so that ++specifying just `--prefix' will affect all of the other directory ++specifications that were not explicitly provided. ++ ++ The most portable way to affect installation locations is to pass the ++correct locations to `configure'; however, many packages provide one or ++both of the following shortcuts of passing variable assignments to the ++`make install' command line to change installation locations without ++having to reconfigure or recompile. ++ ++ The first method involves providing an override variable for each ++affected directory. For example, `make install ++prefix=/alternate/directory' will choose an alternate location for all ++directory configuration variables that were expressed in terms of ++`${prefix}'. Any directories that were specified during `configure', ++but not in terms of `${prefix}', must each be overridden at install ++time for the entire installation to be relocated. The approach of ++makefile variable overrides for each directory variable is required by ++the GNU Coding Standards, and ideally causes no recompilation. ++However, some platforms have known limitations with the semantics of ++shared libraries that end up requiring recompilation when using this ++method, particularly noticeable in packages that use GNU Libtool. ++ ++ The second method involves providing the `DESTDIR' variable. For ++example, `make install DESTDIR=/alternate/directory' will prepend ++`/alternate/directory' before all installation names. The approach of ++`DESTDIR' overrides is not required by the GNU Coding Standards, and ++does not work on platforms that have drive letters. On the other hand, ++it does better at avoiding recompilation issues, and works well even ++when some directory options were not specified in terms of `${prefix}' ++at `configure' time. ++ ++Optional Features ++================= + + If the package supports it, you can cause programs to be installed + with an extra prefix or suffix on their names by giving `configure' the + option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'. + +-Optional Features +-================= +- +-Some packages pay attention to `--enable-FEATURE' options to ++ Some packages pay attention to `--enable-FEATURE' options to + `configure', where FEATURE indicates an optional part of the package. + They may also pay attention to `--with-PACKAGE' options, where PACKAGE + is something like `gnu-as' or `x' (for the X Window System). The +@@ -137,14 +208,53 @@ + you can use the `configure' options `--x-includes=DIR' and + `--x-libraries=DIR' to specify their locations. + ++ Some packages offer the ability to configure how verbose the ++execution of `make' will be. For these packages, running `./configure ++--enable-silent-rules' sets the default to minimal output, which can be ++overridden with `make V=1'; while running `./configure ++--disable-silent-rules' sets the default to verbose, which can be ++overridden with `make V=0'. ++ ++Particular systems ++================== ++ ++ On HP-UX, the default C compiler is not ANSI C compatible. If GNU ++CC is not installed, it is recommended to use the following options in ++order to use an ANSI C compiler: ++ ++ ./configure CC="cc -Ae -D_XOPEN_SOURCE=500" ++ ++and if that doesn't work, install pre-built binaries of GCC for HP-UX. ++ ++ On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot ++parse its `<wchar.h>' header file. The option `-nodtk' can be used as ++a workaround. If GNU CC is not installed, it is therefore recommended ++to try ++ ++ ./configure CC="cc" ++ ++and if that doesn't work, try ++ ++ ./configure CC="cc -nodtk" ++ ++ On Solaris, don't put `/usr/ucb' early in your `PATH'. This ++directory contains several dysfunctional programs; working variants of ++these programs are available in `/usr/bin'. So, if you need `/usr/ucb' ++in your `PATH', put it _after_ `/usr/bin'. ++ ++ On Haiku, software installed for all users goes in `/boot/common', ++not `/usr/local'. It is recommended to use the following options: ++ ++ ./configure --prefix=/boot/common ++ + Specifying the System Type + ========================== + +-There may be some features `configure' cannot figure out automatically, +-but needs to determine by the type of machine the package will run on. +-Usually, assuming the package is built to be run on the _same_ +-architectures, `configure' can figure that out, but if it prints a +-message saying it cannot guess the machine type, give it the ++ There may be some features `configure' cannot figure out ++automatically, but needs to determine by the type of machine the package ++will run on. Usually, assuming the package is built to be run on the ++_same_ architectures, `configure' can figure that out, but if it prints ++a message saying it cannot guess the machine type, give it the + `--build=TYPE' option. TYPE can either be a short name for the system + type, such as `sun4', or a canonical name which has the form: + +@@ -152,7 +262,8 @@ + + where SYSTEM can have one of these forms: + +- OS KERNEL-OS ++ OS ++ KERNEL-OS + + See the file `config.sub' for the possible values of each field. If + `config.sub' isn't included in this package, then this package doesn't +@@ -170,9 +281,9 @@ + Sharing Defaults + ================ + +-If you want to set default values for `configure' scripts to share, you +-can create a site shell script called `config.site' that gives default +-values for variables like `CC', `cache_file', and `prefix'. ++ If you want to set default values for `configure' scripts to share, ++you can create a site shell script called `config.site' that gives ++default values for variables like `CC', `cache_file', and `prefix'. + `configure' looks for `PREFIX/share/config.site' if it exists, then + `PREFIX/etc/config.site' if it exists. Or, you can set the + `CONFIG_SITE' environment variable to the location of the site script. +@@ -181,7 +292,7 @@ + Defining Variables + ================== + +-Variables not defined in a site shell script can be set in the ++ Variables not defined in a site shell script can be set in the + environment passed to `configure'. However, some packages may run + configure again during the build, and the customized values of these + variables may be lost. In order to avoid this problem, you should set +@@ -190,21 +301,29 @@ + ./configure CC=/usr/local2/bin/gcc + + causes the specified `gcc' to be used as the C compiler (unless it is +-overridden in the site shell script). Here is a another example: ++overridden in the site shell script). + +- /bin/bash ./configure CONFIG_SHELL=/bin/bash ++Unfortunately, this technique does not work for `CONFIG_SHELL' due to ++an Autoconf bug. Until the bug is fixed you can use this workaround: + +-Here the `CONFIG_SHELL=/bin/bash' operand causes subsequent +-configuration-related scripts to be executed by `/bin/bash'. ++ CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash + + `configure' Invocation + ====================== + +-`configure' recognizes the following options to control how it operates. ++ `configure' recognizes the following options to control how it ++operates. + + `--help' + `-h' +- Print a summary of the options to `configure', and exit. ++ Print a summary of all of the options to `configure', and exit. ++ ++`--help=short' ++`--help=recursive' ++ Print a summary of the options unique to this package's ++ `configure', and exit. The `short' variant lists options used ++ only in the top level, while the `recursive' variant lists options ++ also present in any nested packages. + + `--version' + `-V' +@@ -231,6 +350,16 @@ + Look for the package's source code in directory DIR. Usually + `configure' can determine that directory automatically. + ++`--prefix=DIR' ++ Use DIR as the installation prefix. *note Installation Names:: ++ for more details, including other options available for fine-tuning ++ the installation locations. ++ ++`--no-create' ++`-n' ++ Run the configure checks, but stop before creating any output ++ files. ++ + `configure' also accepts some other, not widely useful, options. Run + `configure --help' for more details. + +diff -Nur exmap-console-0.4.1.orig/Makefile.am exmap-console-0.4.1/Makefile.am +--- exmap-console-0.4.1.orig/Makefile.am 2006-11-06 18:05:01.000000000 +0100 ++++ exmap-console-0.4.1/Makefile.am 2011-01-11 12:44:03.000000000 +0100 +@@ -1,4 +1,4 @@ +-SUBDIRS=kernel src doc ++SUBDIRS=src + + DISTCLEANFILES = *~ Makefile.in install-sh missing depcomp *.m4 config.log config.status Makefile + +diff -Nur exmap-console-0.4.1.orig/Makefile.in exmap-console-0.4.1/Makefile.in +--- exmap-console-0.4.1.orig/Makefile.in 2007-02-26 12:44:02.000000000 +0100 ++++ exmap-console-0.4.1/Makefile.in 2011-01-11 12:44:16.000000000 +0100 +@@ -1,8 +1,9 @@ +-# Makefile.in generated by automake 1.9.6 from Makefile.am. ++# Makefile.in generated by automake 1.11.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, ++# Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -13,15 +14,12 @@ + # PARTICULAR PURPOSE. + + @SET_MAKE@ +-srcdir = @srcdir@ +-top_srcdir = @top_srcdir@ + VPATH = @srcdir@ + pkgdatadir = $(datadir)/@PACKAGE@ +-pkglibdir = $(libdir)/@PACKAGE@ + pkgincludedir = $(includedir)/@PACKAGE@ +-top_builddir = . ++pkglibdir = $(libdir)/@PACKAGE@ ++pkglibexecdir = $(libexecdir)/@PACKAGE@ + am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +-INSTALL = @INSTALL@ + install_sh_DATA = $(install_sh) -c -m 644 + install_sh_PROGRAM = $(install_sh) -c + install_sh_SCRIPT = $(install_sh) -c +@@ -42,17 +40,24 @@ + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ +- configure.lineno configure.status.lineno ++ configure.lineno config.status.lineno + mkinstalldirs = $(install_sh) -d + CONFIG_CLEAN_FILES = ++CONFIG_CLEAN_VPATH_FILES = + SOURCES = + DIST_SOURCES = + RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ + html-recursive info-recursive install-data-recursive \ +- install-exec-recursive install-info-recursive \ +- install-recursive installcheck-recursive installdirs-recursive \ +- pdf-recursive ps-recursive uninstall-info-recursive \ +- uninstall-recursive ++ install-dvi-recursive install-exec-recursive \ ++ install-html-recursive install-info-recursive \ ++ install-pdf-recursive install-ps-recursive install-recursive \ ++ installcheck-recursive installdirs-recursive pdf-recursive \ ++ ps-recursive uninstall-recursive ++RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ ++ distclean-recursive maintainer-clean-recursive ++AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ ++ $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ ++ distdir dist dist-all distcheck + ETAGS = etags + CTAGS = ctags + DIST_SUBDIRS = $(SUBDIRS) +@@ -60,16 +65,39 @@ + distdir = $(PACKAGE)-$(VERSION) + top_distdir = $(distdir) + am__remove_distdir = \ +- { test ! -d $(distdir) \ +- || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \ +- && rm -fr $(distdir); }; } ++ { test ! -d "$(distdir)" \ ++ || { find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \ ++ && rm -fr "$(distdir)"; }; } ++am__relativize = \ ++ dir0=`pwd`; \ ++ sed_first='s,^\([^/]*\)/.*$$,\1,'; \ ++ sed_rest='s,^[^/]*/*,,'; \ ++ sed_last='s,^.*/\([^/]*\)$$,\1,'; \ ++ sed_butlast='s,/*[^/]*$$,,'; \ ++ while test -n "$$dir1"; do \ ++ first=`echo "$$dir1" | sed -e "$$sed_first"`; \ ++ if test "$$first" != "."; then \ ++ if test "$$first" = ".."; then \ ++ dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \ ++ dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \ ++ else \ ++ first2=`echo "$$dir2" | sed -e "$$sed_first"`; \ ++ if test "$$first2" = "$$first"; then \ ++ dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \ ++ else \ ++ dir2="../$$dir2"; \ ++ fi; \ ++ dir0="$$dir0"/"$$first"; \ ++ fi; \ ++ fi; \ ++ dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \ ++ done; \ ++ reldir="$$dir2" + DIST_ARCHIVES = $(distdir).tar.gz + GZIP_ENV = --best + distuninstallcheck_listfiles = find . -type f -print + distcleancheck_listfiles = find . -type f -print + ACLOCAL = @ACLOCAL@ +-AMDEP_FALSE = @AMDEP_FALSE@ +-AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AUTOCONF = @AUTOCONF@ + AUTOHEADER = @AUTOHEADER@ +@@ -82,8 +110,6 @@ + CYGPATH_W = @CYGPATH_W@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ +-DODOCS_FALSE = @DODOCS_FALSE@ +-DODOCS_TRUE = @DODOCS_TRUE@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ +@@ -91,38 +117,41 @@ + GCC_CFLAGS = @GCC_CFLAGS@ + GLIB_CFLAGS = @GLIB_CFLAGS@ + GLIB_LIBS = @GLIB_LIBS@ +-HAVE_HELPTOMAN_FALSE = @HAVE_HELPTOMAN_FALSE@ +-HAVE_HELPTOMAN_TRUE = @HAVE_HELPTOMAN_TRUE@ + HELPTOMAN = @HELPTOMAN@ ++INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ + INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +-INTERACTIVE_FALSE = @INTERACTIVE_FALSE@ +-INTERACTIVE_TRUE = @INTERACTIVE_TRUE@ + LDFLAGS = @LDFLAGS@ + LIBOBJS = @LIBOBJS@ + LIBS = @LIBS@ + LTLIBOBJS = @LTLIBOBJS@ + MAKEINFO = @MAKEINFO@ ++MKDIR_P = @MKDIR_P@ + OBJEXT = @OBJEXT@ + PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ ++PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PKG_CONFIG = @PKG_CONFIG@ ++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ ++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ + READLINE_CFLAGS = @READLINE_CFLAGS@ + READLINE_LIBS = @READLINE_LIBS@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + STRIP = @STRIP@ + VERSION = @VERSION@ ++abs_builddir = @abs_builddir@ ++abs_srcdir = @abs_srcdir@ ++abs_top_builddir = @abs_top_builddir@ ++abs_top_srcdir = @abs_top_srcdir@ + ac_ct_CC = @ac_ct_CC@ +-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ +-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ + am__include = @am__include@ + am__leading_dot = @am__leading_dot@ + am__quote = @am__quote@ +@@ -130,6 +159,7 @@ + am__untar = @am__untar@ + bindir = @bindir@ + build_alias = @build_alias@ ++builddir = @builddir@ + datadir = @datadir@ + datarootdir = @datarootdir@ + docdir = @docdir@ +@@ -153,9 +183,13 @@ + psdir = @psdir@ + sbindir = @sbindir@ + sharedstatedir = @sharedstatedir@ ++srcdir = @srcdir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ +-SUBDIRS = kernel src doc ++top_build_prefix = @top_build_prefix@ ++top_builddir = @top_builddir@ ++top_srcdir = @top_srcdir@ ++SUBDIRS = src + DISTCLEANFILES = *~ Makefile.in install-sh missing depcomp *.m4 config.log config.status Makefile + all: all-recursive + +@@ -166,15 +200,15 @@ + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ +- echo ' cd $(srcdir) && $(AUTOMAKE) --gnu '; \ +- cd $(srcdir) && $(AUTOMAKE) --gnu \ ++ echo ' cd $(srcdir) && $(AUTOMAKE) --gnu'; \ ++ $(am__cd) $(srcdir) && $(AUTOMAKE) --gnu \ + && exit 0; \ + exit 1;; \ + esac; \ + done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile'; \ +- cd $(top_srcdir) && \ +- $(AUTOMAKE) --gnu Makefile ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile'; \ ++ $(am__cd) $(top_srcdir) && \ ++ $(AUTOMAKE) --gnu Makefile + .PRECIOUS: Makefile + Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ +@@ -190,10 +224,10 @@ + $(SHELL) ./config.status --recheck + + $(top_srcdir)/configure: $(am__configure_deps) +- cd $(srcdir) && $(AUTOCONF) ++ $(am__cd) $(srcdir) && $(AUTOCONF) + $(ACLOCAL_M4): $(am__aclocal_m4_deps) +- cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) +-uninstall-info-am: ++ $(am__cd) $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) ++$(am__aclocal_m4_deps): + + # This directory's subdirectories are mostly independent; you can cd + # into them and run `make' without going through this Makefile. +@@ -202,7 +236,7 @@ + # (which will cause the Makefiles to be regenerated when you run `make'); + # (2) otherwise, pass the desired values on the `make' command line. + $(RECURSIVE_TARGETS): +- @failcom='exit 1'; \ ++ @fail= failcom='exit 1'; \ + for f in x $$MAKEFLAGS; do \ + case $$f in \ + *=* | --[!k]*);; \ +@@ -219,16 +253,15 @@ + else \ + local_target="$$target"; \ + fi; \ +- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ ++ ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ + || eval $$failcom; \ + done; \ + if test "$$dot_seen" = "no"; then \ + $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ + fi; test -z "$$fail" + +-mostlyclean-recursive clean-recursive distclean-recursive \ +-maintainer-clean-recursive: +- @failcom='exit 1'; \ ++$(RECURSIVE_CLEAN_TARGETS): ++ @fail= failcom='exit 1'; \ + for f in x $$MAKEFLAGS; do \ + case $$f in \ + *=* | --[!k]*);; \ +@@ -254,16 +287,16 @@ + else \ + local_target="$$target"; \ + fi; \ +- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ ++ ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ + || eval $$failcom; \ + done && test -z "$$fail" + tags-recursive: + list='$(SUBDIRS)'; for subdir in $$list; do \ +- test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ ++ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ + done + ctags-recursive: + list='$(SUBDIRS)'; for subdir in $$list; do \ +- test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ ++ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ + done + + ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) +@@ -271,14 +304,14 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique + tags: TAGS + + TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +- tags=; \ ++ set x; \ + here=`pwd`; \ + if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ + include_option=--etags-include; \ +@@ -290,92 +323,114 @@ + list='$(SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ + test ! -f $$subdir/TAGS || \ +- tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ ++ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ + fi; \ + done; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ +- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ ++ shift; \ ++ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ +- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +- $$tags $$unique; \ ++ if test $$# -gt 0; then \ ++ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ++ "$$@" $$unique; \ ++ else \ ++ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ++ $$unique; \ ++ fi; \ + fi + ctags: CTAGS + CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +- tags=; \ +- here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ +- test -z "$(CTAGS_ARGS)$$tags$$unique" \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ ++ test -z "$(CTAGS_ARGS)$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ +- $$tags $$unique ++ $$unique + + GTAGS: + here=`$(am__cd) $(top_builddir) && pwd` \ +- && cd $(top_srcdir) \ +- && gtags -i $(GTAGS_ARGS) $$here ++ && $(am__cd) $(top_srcdir) \ ++ && gtags -i $(GTAGS_ARGS) "$$here" + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + + distdir: $(DISTFILES) + $(am__remove_distdir) +- mkdir $(distdir) +- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ +- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ +- list='$(DISTFILES)'; for file in $$list; do \ +- case $$file in \ +- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ +- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ +- esac; \ ++ test -d "$(distdir)" || mkdir "$(distdir)" ++ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ list='$(DISTFILES)'; \ ++ dist_files=`for file in $$list; do echo $$file; done | \ ++ sed -e "s|^$$srcdirstrip/||;t" \ ++ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ ++ case $$dist_files in \ ++ */*) $(MKDIR_P) `echo "$$dist_files" | \ ++ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ ++ sort -u` ;; \ ++ esac; \ ++ for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ +- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ +- if test "$$dir" != "$$file" && test "$$dir" != "."; then \ +- dir="/$$dir"; \ +- $(mkdir_p) "$(distdir)$$dir"; \ +- else \ +- dir=''; \ +- fi; \ + if test -d $$d/$$file; then \ ++ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ ++ if test -d "$(distdir)/$$file"; then \ ++ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ ++ fi; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ +- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ ++ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ ++ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ +- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ ++ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ + else \ +- test -f $(distdir)/$$file \ +- || cp -p $$d/$$file $(distdir)/$$file \ ++ test -f "$(distdir)/$$file" \ ++ || cp -p $$d/$$file "$(distdir)/$$file" \ + || exit 1; \ + fi; \ + done +- list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ ++ @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ + test -d "$(distdir)/$$subdir" \ +- || $(mkdir_p) "$(distdir)/$$subdir" \ ++ || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ +- distdir=`$(am__cd) $(distdir) && pwd`; \ +- top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ +- (cd $$subdir && \ ++ fi; \ ++ done ++ @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ ++ if test "$$subdir" = .; then :; else \ ++ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ ++ $(am__relativize); \ ++ new_distdir=$$reldir; \ ++ dir1=$$subdir; dir2="$(top_distdir)"; \ ++ $(am__relativize); \ ++ new_top_distdir=$$reldir; \ ++ echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \ ++ echo " am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \ ++ ($(am__cd) $$subdir && \ + $(MAKE) $(AM_MAKEFLAGS) \ +- top_distdir="$$top_distdir" \ +- distdir="$$distdir/$$subdir" \ ++ top_distdir="$$new_top_distdir" \ ++ distdir="$$new_distdir" \ ++ am__remove_distdir=: \ ++ am__skip_length_check=: \ ++ am__skip_mode_fix=: \ + distdir) \ + || exit 1; \ + fi; \ + done +- -find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \ ++ -test -n "$(am__skip_mode_fix)" \ ++ || find "$(distdir)" -type d ! -perm -755 \ ++ -exec chmod u+rwx,go+rx {} \; -o \ + ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \ + ! -type d ! -perm -400 -exec chmod a+r {} \; -o \ +- ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \ +- || chmod -R a+r $(distdir) ++ ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \ ++ || chmod -R a+r "$(distdir)" + dist-gzip: distdir + tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz + $(am__remove_distdir) +@@ -384,6 +439,14 @@ + tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2 + $(am__remove_distdir) + ++dist-lzma: distdir ++ tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma ++ $(am__remove_distdir) ++ ++dist-xz: distdir ++ tardir=$(distdir) && $(am__tar) | xz -c >$(distdir).tar.xz ++ $(am__remove_distdir) ++ + dist-tarZ: distdir + tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z + $(am__remove_distdir) +@@ -407,13 +470,17 @@ + distcheck: dist + case '$(DIST_ARCHIVES)' in \ + *.tar.gz*) \ +- GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\ ++ GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\ + *.tar.bz2*) \ +- bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\ ++ bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\ ++ *.tar.lzma*) \ ++ lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\ ++ *.tar.xz*) \ ++ xz -dc $(distdir).tar.xz | $(am__untar) ;;\ + *.tar.Z*) \ + uncompress -c $(distdir).tar.Z | $(am__untar) ;;\ + *.shar.gz*) \ +- GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\ ++ GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\ + *.zip*) \ + unzip $(distdir).zip ;;\ + esac +@@ -421,9 +488,11 @@ + mkdir $(distdir)/_build + mkdir $(distdir)/_inst + chmod a-w $(distdir) ++ test -d $(distdir)/_build || exit 0; \ + dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \ + && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \ +- && cd $(distdir)/_build \ ++ && am__cwd=`pwd` \ ++ && $(am__cd) $(distdir)/_build \ + && ../configure --srcdir=.. --prefix="$$dc_install_base" \ + $(DISTCHECK_CONFIGURE_FLAGS) \ + && $(MAKE) $(AM_MAKEFLAGS) \ +@@ -445,13 +514,15 @@ + && rm -rf "$$dc_destdir" \ + && $(MAKE) $(AM_MAKEFLAGS) dist \ + && rm -rf $(DIST_ARCHIVES) \ +- && $(MAKE) $(AM_MAKEFLAGS) distcleancheck ++ && $(MAKE) $(AM_MAKEFLAGS) distcleancheck \ ++ && cd "$$am__cwd" \ ++ || exit 1 + $(am__remove_distdir) + @(echo "$(distdir) archives ready for distribution: "; \ + list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \ +- sed -e '1{h;s/./=/g;p;x;}' -e '$${p;x;}' ++ sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x' + distuninstallcheck: +- @cd $(distuninstallcheck_dir) \ ++ @$(am__cd) '$(distuninstallcheck_dir)' \ + && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \ + || { echo "ERROR: files left after uninstall:" ; \ + if test -n "$(DESTDIR)"; then \ +@@ -493,6 +564,7 @@ + + distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) + -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES) + + maintainer-clean-generic: +@@ -510,18 +582,38 @@ + + html: html-recursive + ++html-am: ++ + info: info-recursive + + info-am: + + install-data-am: + ++install-dvi: install-dvi-recursive ++ ++install-dvi-am: ++ + install-exec-am: + ++install-html: install-html-recursive ++ ++install-html-am: ++ + install-info: install-info-recursive + ++install-info-am: ++ + install-man: + ++install-pdf: install-pdf-recursive ++ ++install-pdf-am: ++ ++install-ps: install-ps-recursive ++ ++install-ps-am: ++ + installcheck-am: + + maintainer-clean: maintainer-clean-recursive +@@ -542,29 +634,32 @@ + + ps-am: + +-uninstall-am: uninstall-info-am ++uninstall-am: + +-uninstall-info: uninstall-info-recursive ++.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ ++ install-am install-strip tags-recursive + +-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am am--refresh check \ +- check-am clean clean-generic clean-recursive ctags \ +- ctags-recursive dist dist-all dist-bzip2 dist-gzip dist-shar \ +- dist-tarZ dist-zip distcheck distclean distclean-generic \ +- distclean-recursive distclean-tags distcleancheck distdir \ +- distuninstallcheck dvi dvi-am html html-am info info-am \ +- install install-am install-data install-data-am install-exec \ +- install-exec-am install-info install-info-am install-man \ +- install-strip installcheck installcheck-am installdirs \ +- installdirs-am maintainer-clean maintainer-clean-generic \ +- maintainer-clean-recursive mostlyclean mostlyclean-generic \ +- mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \ +- uninstall uninstall-am uninstall-info-am ++.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ ++ all all-am am--refresh check check-am clean clean-generic \ ++ ctags ctags-recursive dist dist-all dist-bzip2 dist-gzip \ ++ dist-lzma dist-shar dist-tarZ dist-xz dist-zip distcheck \ ++ distclean distclean-generic distclean-tags distcleancheck \ ++ distdir distuninstallcheck dvi dvi-am html html-am info \ ++ info-am install install-am install-data install-data-am \ ++ install-dvi install-dvi-am install-exec install-exec-am \ ++ install-html install-html-am install-info install-info-am \ ++ install-man install-pdf install-pdf-am install-ps \ ++ install-ps-am install-strip installcheck installcheck-am \ ++ installdirs installdirs-am maintainer-clean \ ++ maintainer-clean-generic mostlyclean mostlyclean-generic pdf \ ++ pdf-am ps ps-am tags tags-recursive uninstall uninstall-am + + + local-distclean: + $(RM) -rf autom4te.cache + + distclean: distclean-recursive local-distclean ++ + # Tell versions [3.59,3.63) of GNU make to not export all variables. + # Otherwise a system limit (for SysV at least) may be exceeded. + .NOEXPORT: +diff -Nur exmap-console-0.4.1.orig/aclocal.m4 exmap-console-0.4.1/aclocal.m4 +--- exmap-console-0.4.1.orig/aclocal.m4 2007-02-26 12:43:59.000000000 +0100 ++++ exmap-console-0.4.1/aclocal.m4 2011-01-11 12:44:15.000000000 +0100 +@@ -1,7 +1,7 @@ +-# generated automatically by aclocal 1.9.6 -*- Autoconf -*- ++# generated automatically by aclocal 1.11.1 -*- Autoconf -*- + + # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, +-# 2005 Free Software Foundation, Inc. ++# 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc. + # This file is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -11,7 +11,16 @@ + # even the implied warranty of MERCHANTABILITY or FITNESS FOR A + # PARTICULAR PURPOSE. + ++m4_ifndef([AC_AUTOCONF_VERSION], ++ [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl ++m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.68],, ++[m4_warning([this file was generated for autoconf 2.68. ++You have another version of autoconf. It may work, but is not guaranteed to. ++If you have problems, you may need to regenerate the build system entirely. ++To do so, use the procedure documented by the package, typically `autoreconf'.])]) ++ + # pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- ++# serial 1 (pkg-config-0.24) + # + # Copyright © 2004 Scott James Remnant <scott@netsplit.com>. + # +@@ -39,7 +48,10 @@ + AC_DEFUN([PKG_PROG_PKG_CONFIG], + [m4_pattern_forbid([^_?PKG_[A-Z_]+$]) + m4_pattern_allow([^PKG_CONFIG(_PATH)?$]) +-AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])dnl ++AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility]) ++AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path]) ++AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path]) ++ + if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then + AC_PATH_TOOL([PKG_CONFIG], [pkg-config]) + fi +@@ -52,7 +64,6 @@ + AC_MSG_RESULT([no]) + PKG_CONFIG="" + fi +- + fi[]dnl + ])# PKG_PROG_PKG_CONFIG + +@@ -61,34 +72,31 @@ + # Check to see whether a particular set of modules exists. Similar + # to PKG_CHECK_MODULES(), but does not set variables or print errors. + # +-# +-# Similar to PKG_CHECK_MODULES, make sure that the first instance of +-# this or PKG_CHECK_MODULES is called, or make sure to call +-# PKG_CHECK_EXISTS manually ++# Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG]) ++# only at the first occurence in configure.ac, so if the first place ++# it's called might be skipped (such as if it is within an "if", you ++# have to call PKG_CHECK_EXISTS manually + # -------------------------------------------------------------- + AC_DEFUN([PKG_CHECK_EXISTS], + [AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl + if test -n "$PKG_CONFIG" && \ + AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then +- m4_ifval([$2], [$2], [:]) ++ m4_default([$2], [:]) + m4_ifvaln([$3], [else + $3])dnl + fi]) + +- + # _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES]) + # --------------------------------------------- + m4_define([_PKG_CONFIG], +-[if test -n "$PKG_CONFIG"; then +- if test -n "$$1"; then +- pkg_cv_[]$1="$$1" +- else +- PKG_CHECK_EXISTS([$3], +- [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`], +- [pkg_failed=yes]) +- fi +-else +- pkg_failed=untried ++[if test -n "$$1"; then ++ pkg_cv_[]$1="$$1" ++ elif test -n "$PKG_CONFIG"; then ++ PKG_CHECK_EXISTS([$3], ++ [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`], ++ [pkg_failed=yes]) ++ else ++ pkg_failed=untried + fi[]dnl + ])# _PKG_CONFIG + +@@ -130,16 +138,17 @@ + See the pkg-config man page for more details.]) + + if test $pkg_failed = yes; then ++ AC_MSG_RESULT([no]) + _PKG_SHORT_ERRORS_SUPPORTED + if test $_pkg_short_errors_supported = yes; then +- $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$2"` ++ $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1` + else +- $1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"` ++ $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD + +- ifelse([$4], , [AC_MSG_ERROR(dnl ++ m4_default([$4], [AC_MSG_ERROR( + [Package requirements ($2) were not met: + + $$1_PKG_ERRORS +@@ -147,28 +156,28 @@ + Consider adjusting the PKG_CONFIG_PATH environment variable if you + installed software in a non-standard prefix. + +-_PKG_TEXT +-])], +- [$4]) ++_PKG_TEXT])[]dnl ++ ]) + elif test $pkg_failed = untried; then +- ifelse([$4], , [AC_MSG_FAILURE(dnl ++ AC_MSG_RESULT([no]) ++ m4_default([$4], [AC_MSG_FAILURE( + [The pkg-config script could not be found or is too old. Make sure it + is in your PATH or set the PKG_CONFIG environment variable to the full + path to pkg-config. + + _PKG_TEXT + +-To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.])], +- [$4]) ++To get pkg-config, see <http://pkg-config.freedesktop.org/>.])dnl ++ ]) + else + $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS + $1[]_LIBS=$pkg_cv_[]$1[]_LIBS + AC_MSG_RESULT([yes]) +- ifelse([$3], , :, [$3]) ++ $3 + fi[]dnl + ])# PKG_CHECK_MODULES + +-# Copyright (C) 2002, 2003, 2005 Free Software Foundation, Inc. ++# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. + # + # This file is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, +@@ -178,14 +187,31 @@ + # ---------------------------- + # Automake X.Y traces this macro to ensure aclocal.m4 has been + # generated from the m4 files accompanying Automake X.Y. +-AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version="1.9"]) ++# (This private macro should not be called outside this file.) ++AC_DEFUN([AM_AUTOMAKE_VERSION], ++[am__api_version='1.11' ++dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to ++dnl require some minimum version. Point them to the right macro. ++m4_if([$1], [1.11.1], [], ++ [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ++]) ++ ++# _AM_AUTOCONF_VERSION(VERSION) ++# ----------------------------- ++# aclocal traces this macro to find the Autoconf version. ++# This is a private macro too. Using m4_define simplifies ++# the logic in aclocal, which can simply ignore this definition. ++m4_define([_AM_AUTOCONF_VERSION], []) + + # AM_SET_CURRENT_AUTOMAKE_VERSION + # ------------------------------- +-# Call AM_AUTOMAKE_VERSION so it can be traced. +-# This function is AC_REQUIREd by AC_INIT_AUTOMAKE. ++# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. ++# This function is AC_REQUIREd by AM_INIT_AUTOMAKE. + AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], +- [AM_AUTOMAKE_VERSION([1.9.6])]) ++[AM_AUTOMAKE_VERSION([1.11.1])dnl ++m4_ifndef([AC_AUTOCONF_VERSION], ++ [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl ++_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) + + # AM_AUX_DIR_EXPAND -*- Autoconf -*- + +@@ -242,14 +268,14 @@ + + # AM_CONDITIONAL -*- Autoconf -*- + +-# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005 ++# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006, 2008 + # Free Software Foundation, Inc. + # + # This file is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. + +-# serial 7 ++# serial 9 + + # AM_CONDITIONAL(NAME, SHELL-CONDITION) + # ------------------------------------- +@@ -258,8 +284,11 @@ + [AC_PREREQ(2.52)dnl + ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])], + [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl +-AC_SUBST([$1_TRUE]) +-AC_SUBST([$1_FALSE]) ++AC_SUBST([$1_TRUE])dnl ++AC_SUBST([$1_FALSE])dnl ++_AM_SUBST_NOTMAKE([$1_TRUE])dnl ++_AM_SUBST_NOTMAKE([$1_FALSE])dnl ++m4_define([_AM_COND_VALUE_$1], [$2])dnl + if $2; then + $1_TRUE= + $1_FALSE='#' +@@ -273,15 +302,14 @@ + Usually this means the macro was only invoked conditionally.]]) + fi])]) + +- +-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005 ++# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009 + # Free Software Foundation, Inc. + # + # This file is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. + +-# serial 8 ++# serial 10 + + # There are a few dirty hacks below to avoid letting `AC_PROG_CC' be + # written in clear, in which case automake, when reading aclocal.m4, +@@ -309,6 +337,7 @@ + ifelse([$1], CC, [depcc="$CC" am_compiler_list=], + [$1], CXX, [depcc="$CXX" am_compiler_list=], + [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'], ++ [$1], UPC, [depcc="$UPC" am_compiler_list=], + [$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'], + [depcc="$$1" am_compiler_list=]) + +@@ -337,6 +366,16 @@ + if test "$am_compiler_list" = ""; then + am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp` + fi ++ am__universal=false ++ m4_case([$1], [CC], ++ [case " $depcc " in #( ++ *\ -arch\ *\ -arch\ *) am__universal=true ;; ++ esac], ++ [CXX], ++ [case " $depcc " in #( ++ *\ -arch\ *\ -arch\ *) am__universal=true ;; ++ esac]) ++ + for depmode in $am_compiler_list; do + # Setup a source with many dependencies, because some compilers + # like to wrap large dependency lists on column 80 (with \), and +@@ -354,7 +393,17 @@ + done + echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf + ++ # We check with `-c' and `-o' for the sake of the "dashmstdout" ++ # mode. It turns out that the SunPro C++ compiler does not properly ++ # handle `-M -o', and we need to detect this. Also, some Intel ++ # versions had trouble with output in subdirs ++ am__obj=sub/conftest.${OBJEXT-o} ++ am__minus_obj="-o $am__obj" + case $depmode in ++ gcc) ++ # This depmode causes a compiler race in universal mode. ++ test "$am__universal" = false || continue ++ ;; + nosideeffect) + # after this tag, mechanisms are not by side-effect, so they'll + # only be used when explicitly requested +@@ -364,18 +413,23 @@ + break + fi + ;; ++ msvisualcpp | msvcmsys) ++ # This compiler won't grok `-c -o', but also, the minuso test has ++ # not run yet. These depmodes are late enough in the game, and ++ # so weak that their functioning should not be impacted. ++ am__obj=conftest.${OBJEXT-o} ++ am__minus_obj= ++ ;; + none) break ;; + esac +- # We check with `-c' and `-o' for the sake of the "dashmstdout" +- # mode. It turns out that the SunPro C++ compiler does not properly +- # handle `-M -o', and we need to detect this. + if depmode=$depmode \ +- source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \ ++ source=sub/conftest.c object=$am__obj \ + depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ +- $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ ++ $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \ + >/dev/null 2>conftest.err && ++ grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && + grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && +- grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && ++ grep $am__obj sub/conftest.Po > /dev/null 2>&1 && + ${MAKE-make} -s -f confmf > /dev/null 2>&1; then + # icc doesn't choke on unknown options, it will just issue warnings + # or remarks (even with -Werror). So we grep stderr for any message +@@ -426,61 +480,74 @@ + AMDEPBACKSLASH='\' + fi + AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno]) +-AC_SUBST([AMDEPBACKSLASH]) ++AC_SUBST([AMDEPBACKSLASH])dnl ++_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl + ]) + + # Generate code to set up dependency tracking. -*- Autoconf -*- + +-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005 ++# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008 + # Free Software Foundation, Inc. + # + # This file is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. + +-#serial 3 ++#serial 5 + + # _AM_OUTPUT_DEPENDENCY_COMMANDS + # ------------------------------ + AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], +-[for mf in $CONFIG_FILES; do +- # Strip MF so we end up with the name of the file. +- mf=`echo "$mf" | sed -e 's/:.*$//'` +- # Check whether this is an Automake generated Makefile or not. +- # We used to match only the files named `Makefile.in', but +- # some people rename them; so instead we look at the file content. +- # Grep'ing the first line is not enough: some people post-process +- # each Makefile.in and add a new line on top of each file to say so. +- # So let's grep whole file. +- if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then +- dirpart=`AS_DIRNAME("$mf")` +- else +- continue +- fi +- # Extract the definition of DEPDIR, am__include, and am__quote +- # from the Makefile without running `make'. +- DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` +- test -z "$DEPDIR" && continue +- am__include=`sed -n 's/^am__include = //p' < "$mf"` +- test -z "am__include" && continue +- am__quote=`sed -n 's/^am__quote = //p' < "$mf"` +- # When using ansi2knr, U may be empty or an underscore; expand it +- U=`sed -n 's/^U = //p' < "$mf"` +- # Find all dependency output files, they are included files with +- # $(DEPDIR) in their names. We invoke sed twice because it is the +- # simplest approach to changing $(DEPDIR) to its actual value in the +- # expansion. +- for file in `sed -n " +- s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ +- sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do +- # Make sure the directory exists. +- test -f "$dirpart/$file" && continue +- fdir=`AS_DIRNAME(["$file"])` +- AS_MKDIR_P([$dirpart/$fdir]) +- # echo "creating $dirpart/$file" +- echo '# dummy' > "$dirpart/$file" ++[{ ++ # Autoconf 2.62 quotes --file arguments for eval, but not when files ++ # are listed without --file. Let's play safe and only enable the eval ++ # if we detect the quoting. ++ case $CONFIG_FILES in ++ *\'*) eval set x "$CONFIG_FILES" ;; ++ *) set x $CONFIG_FILES ;; ++ esac ++ shift ++ for mf ++ do ++ # Strip MF so we end up with the name of the file. ++ mf=`echo "$mf" | sed -e 's/:.*$//'` ++ # Check whether this is an Automake generated Makefile or not. ++ # We used to match only the files named `Makefile.in', but ++ # some people rename them; so instead we look at the file content. ++ # Grep'ing the first line is not enough: some people post-process ++ # each Makefile.in and add a new line on top of each file to say so. ++ # Grep'ing the whole file is not good either: AIX grep has a line ++ # limit of 2048, but all sed's we know have understand at least 4000. ++ if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then ++ dirpart=`AS_DIRNAME("$mf")` ++ else ++ continue ++ fi ++ # Extract the definition of DEPDIR, am__include, and am__quote ++ # from the Makefile without running `make'. ++ DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` ++ test -z "$DEPDIR" && continue ++ am__include=`sed -n 's/^am__include = //p' < "$mf"` ++ test -z "am__include" && continue ++ am__quote=`sed -n 's/^am__quote = //p' < "$mf"` ++ # When using ansi2knr, U may be empty or an underscore; expand it ++ U=`sed -n 's/^U = //p' < "$mf"` ++ # Find all dependency output files, they are included files with ++ # $(DEPDIR) in their names. We invoke sed twice because it is the ++ # simplest approach to changing $(DEPDIR) to its actual value in the ++ # expansion. ++ for file in `sed -n " ++ s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ ++ sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do ++ # Make sure the directory exists. ++ test -f "$dirpart/$file" && continue ++ fdir=`AS_DIRNAME(["$file"])` ++ AS_MKDIR_P([$dirpart/$fdir]) ++ # echo "creating $dirpart/$file" ++ echo '# dummy' > "$dirpart/$file" ++ done + done +-done ++} + ])# _AM_OUTPUT_DEPENDENCY_COMMANDS + + +@@ -499,14 +566,14 @@ + + # Do all the work for Automake. -*- Autoconf -*- + +-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 +-# Free Software Foundation, Inc. ++# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, ++# 2005, 2006, 2008, 2009 Free Software Foundation, Inc. + # + # This file is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. + +-# serial 12 ++# serial 16 + + # This macro actually does too much. Some checks are only needed if + # your package does certain things. But this isn't really a big deal. +@@ -523,16 +590,20 @@ + # arguments mandatory, and then we can depend on a new Autoconf + # release and drop the old call support. + AC_DEFUN([AM_INIT_AUTOMAKE], +-[AC_PREREQ([2.58])dnl ++[AC_PREREQ([2.62])dnl + dnl Autoconf wants to disallow AM_ names. We explicitly allow + dnl the ones we care about. + m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl + AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl + AC_REQUIRE([AC_PROG_INSTALL])dnl +-# test to see if srcdir already configured +-if test "`cd $srcdir && pwd`" != "`pwd`" && +- test -f $srcdir/config.status; then +- AC_MSG_ERROR([source directory already configured; run "make distclean" there first]) ++if test "`cd $srcdir && pwd`" != "`pwd`"; then ++ # Use -I$(srcdir) only when $(srcdir) != ., so that make's output ++ # is not polluted with repeated "-I." ++ AC_SUBST([am__isrc], [' -I$(srcdir)'])_AM_SUBST_NOTMAKE([am__isrc])dnl ++ # test to see if srcdir already configured ++ if test -f $srcdir/config.status; then ++ AC_MSG_ERROR([source directory already configured; run "make distclean" there first]) ++ fi + fi + + # test whether we have cygpath +@@ -552,6 +623,9 @@ + AC_SUBST([PACKAGE], [$1])dnl + AC_SUBST([VERSION], [$2])], + [_AM_SET_OPTIONS([$1])dnl ++dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT. ++m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,, ++ [m4_fatal([AC_INIT should be called with package and version arguments])])dnl + AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl + AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl + +@@ -567,8 +641,8 @@ + AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}) + AM_MISSING_PROG(AUTOHEADER, autoheader) + AM_MISSING_PROG(MAKEINFO, makeinfo) +-AM_PROG_INSTALL_SH +-AM_PROG_INSTALL_STRIP ++AC_REQUIRE([AM_PROG_INSTALL_SH])dnl ++AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl + AC_REQUIRE([AM_PROG_MKDIR_P])dnl + # We need awk for the "check" target. The system "awk" is bad on + # some platforms. +@@ -576,20 +650,37 @@ + AC_REQUIRE([AC_PROG_MAKE_SET])dnl + AC_REQUIRE([AM_SET_LEADING_DOT])dnl + _AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])], +- [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])], +- [_AM_PROG_TAR([v7])])]) ++ [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])], ++ [_AM_PROG_TAR([v7])])]) + _AM_IF_OPTION([no-dependencies],, + [AC_PROVIDE_IFELSE([AC_PROG_CC], +- [_AM_DEPENDENCIES(CC)], +- [define([AC_PROG_CC], +- defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl ++ [_AM_DEPENDENCIES(CC)], ++ [define([AC_PROG_CC], ++ defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl + AC_PROVIDE_IFELSE([AC_PROG_CXX], +- [_AM_DEPENDENCIES(CXX)], +- [define([AC_PROG_CXX], +- defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl ++ [_AM_DEPENDENCIES(CXX)], ++ [define([AC_PROG_CXX], ++ defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl ++AC_PROVIDE_IFELSE([AC_PROG_OBJC], ++ [_AM_DEPENDENCIES(OBJC)], ++ [define([AC_PROG_OBJC], ++ defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl + ]) ++_AM_IF_OPTION([silent-rules], [AC_REQUIRE([AM_SILENT_RULES])])dnl ++dnl The `parallel-tests' driver may need to know about EXEEXT, so add the ++dnl `am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This macro ++dnl is hooked onto _AC_COMPILER_EXEEXT early, see below. ++AC_CONFIG_COMMANDS_PRE(dnl ++[m4_provide_if([_AM_COMPILER_EXEEXT], ++ [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl + ]) + ++dnl Hook into `_AC_COMPILER_EXEEXT' early to learn its expansion. Do not ++dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further ++dnl mangled by Autoconf and run in a shell conditional statement. ++m4_define([_AC_COMPILER_EXEEXT], ++m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])]) ++ + + # When config.status generates a header, we must update the stamp-h file. + # This file resides in the same directory as the config header +@@ -600,18 +691,19 @@ + # our stamp files there. + AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK], + [# Compute $1's index in $config_headers. ++_am_arg=$1 + _am_stamp_count=1 + for _am_header in $config_headers :; do + case $_am_header in +- $1 | $1:* ) ++ $_am_arg | $_am_arg:* ) + break ;; + * ) + _am_stamp_count=`expr $_am_stamp_count + 1` ;; + esac + done +-echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count]) ++echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) + +-# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. ++# Copyright (C) 2001, 2003, 2005, 2008 Free Software Foundation, Inc. + # + # This file is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, +@@ -622,7 +714,14 @@ + # Define $install_sh. + AC_DEFUN([AM_PROG_INSTALL_SH], + [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl +-install_sh=${install_sh-"$am_aux_dir/install-sh"} ++if test x"${install_sh}" != xset; then ++ case $am_aux_dir in ++ *\ * | *\ *) ++ install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;; ++ *) ++ install_sh="\${SHELL} $am_aux_dir/install-sh" ++ esac ++fi + AC_SUBST(install_sh)]) + + # Copyright (C) 2003, 2005 Free Software Foundation, Inc. +@@ -648,13 +747,13 @@ + + # Check to see how 'make' treats includes. -*- Autoconf -*- + +-# Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc. ++# Copyright (C) 2001, 2002, 2003, 2005, 2009 Free Software Foundation, Inc. + # + # This file is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. + +-# serial 3 ++# serial 4 + + # AM_MAKE_INCLUDE() + # ----------------- +@@ -663,7 +762,7 @@ + [am_make=${MAKE-make} + cat > confinc << 'END' + am__doit: +- @echo done ++ @echo this is the am__doit target + .PHONY: am__doit + END + # If we don't find an include directive, just comment out the code. +@@ -673,24 +772,24 @@ + _am_result=none + # First try GNU make style include. + echo "include confinc" > confmf +-# We grep out `Entering directory' and `Leaving directory' +-# messages which can occur if `w' ends up in MAKEFLAGS. +-# In particular we don't look at `^make:' because GNU make might +-# be invoked under some other name (usually "gmake"), in which +-# case it prints its new name instead of `make'. +-if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then +- am__include=include +- am__quote= +- _am_result=GNU +-fi ++# Ignore all kinds of additional output from `make'. ++case `$am_make -s -f confmf 2> /dev/null` in #( ++*the\ am__doit\ target*) ++ am__include=include ++ am__quote= ++ _am_result=GNU ++ ;; ++esac + # Now try BSD make style include. + if test "$am__include" = "#"; then + echo '.include "confinc"' > confmf +- if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then +- am__include=.include +- am__quote="\"" +- _am_result=BSD +- fi ++ case `$am_make -s -f confmf 2> /dev/null` in #( ++ *the\ am__doit\ target*) ++ am__include=.include ++ am__quote="\"" ++ _am_result=BSD ++ ;; ++ esac + fi + AC_SUBST([am__include]) + AC_SUBST([am__quote]) +@@ -700,14 +799,14 @@ + + # Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- + +-# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2005 ++# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005, 2008 + # Free Software Foundation, Inc. + # + # This file is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. + +-# serial 4 ++# serial 6 + + # AM_MISSING_PROG(NAME, PROGRAM) + # ------------------------------ +@@ -723,7 +822,15 @@ + # If it does, set am_missing_run to use it, otherwise, to nothing. + AC_DEFUN([AM_MISSING_HAS_RUN], + [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl +-test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing" ++AC_REQUIRE_AUX_FILE([missing])dnl ++if test x"${MISSING+set}" != xset; then ++ case $am_aux_dir in ++ *\ * | *\ *) ++ MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;; ++ *) ++ MISSING="\${SHELL} $am_aux_dir/missing" ;; ++ esac ++fi + # Use eval to expand $SHELL + if eval "$MISSING --run true"; then + am_missing_run="$MISSING --run " +@@ -733,7 +840,7 @@ + fi + ]) + +-# Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc. ++# Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc. + # + # This file is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, +@@ -741,70 +848,33 @@ + + # AM_PROG_MKDIR_P + # --------------- +-# Check whether `mkdir -p' is supported, fallback to mkinstalldirs otherwise. +-# +-# Automake 1.8 used `mkdir -m 0755 -p --' to ensure that directories +-# created by `make install' are always world readable, even if the +-# installer happens to have an overly restrictive umask (e.g. 077). +-# This was a mistake. There are at least two reasons why we must not +-# use `-m 0755': +-# - it causes special bits like SGID to be ignored, +-# - it may be too restrictive (some setups expect 775 directories). +-# +-# Do not use -m 0755 and let people choose whatever they expect by +-# setting umask. +-# +-# We cannot accept any implementation of `mkdir' that recognizes `-p'. +-# Some implementations (such as Solaris 8's) are not thread-safe: if a +-# parallel make tries to run `mkdir -p a/b' and `mkdir -p a/c' +-# concurrently, both version can detect that a/ is missing, but only +-# one can create it and the other will error out. Consequently we +-# restrict ourselves to GNU make (using the --version option ensures +-# this.) ++# Check for `mkdir -p'. + AC_DEFUN([AM_PROG_MKDIR_P], +-[if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then +- # We used to keeping the `.' as first argument, in order to +- # allow $(mkdir_p) to be used without argument. As in +- # $(mkdir_p) $(somedir) +- # where $(somedir) is conditionally defined. However this is wrong +- # for two reasons: +- # 1. if the package is installed by a user who cannot write `.' +- # make install will fail, +- # 2. the above comment should most certainly read +- # $(mkdir_p) $(DESTDIR)$(somedir) +- # so it does not work when $(somedir) is undefined and +- # $(DESTDIR) is not. +- # To support the latter case, we have to write +- # test -z "$(somedir)" || $(mkdir_p) $(DESTDIR)$(somedir), +- # so the `.' trick is pointless. +- mkdir_p='mkdir -p --' +-else +- # On NextStep and OpenStep, the `mkdir' command does not +- # recognize any option. It will interpret all options as +- # directories to create, and then abort because `.' already +- # exists. +- for d in ./-p ./--version; +- do +- test -d $d && rmdir $d +- done +- # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists. +- if test -f "$ac_aux_dir/mkinstalldirs"; then +- mkdir_p='$(mkinstalldirs)' +- else +- mkdir_p='$(install_sh) -d' +- fi +-fi +-AC_SUBST([mkdir_p])]) ++[AC_PREREQ([2.60])dnl ++AC_REQUIRE([AC_PROG_MKDIR_P])dnl ++dnl Automake 1.8 to 1.9.6 used to define mkdir_p. We now use MKDIR_P, ++dnl while keeping a definition of mkdir_p for backward compatibility. ++dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile. ++dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of ++dnl Makefile.ins that do not define MKDIR_P, so we do our own ++dnl adjustment using top_builddir (which is defined more often than ++dnl MKDIR_P). ++AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl ++case $mkdir_p in ++ [[\\/$]]* | ?:[[\\/]]*) ;; ++ */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;; ++esac ++]) + + # Helper functions for option handling. -*- Autoconf -*- + +-# Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc. ++# Copyright (C) 2001, 2002, 2003, 2005, 2008 Free Software Foundation, Inc. + # + # This file is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. + +-# serial 3 ++# serial 4 + + # _AM_MANGLE_OPTION(NAME) + # ----------------------- +@@ -821,7 +891,7 @@ + # ---------------------------------- + # OPTIONS is a space-separated list of Automake options. + AC_DEFUN([_AM_SET_OPTIONS], +-[AC_FOREACH([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])]) ++[m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])]) + + # _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET]) + # ------------------------------------------- +@@ -831,14 +901,14 @@ + + # Check to make sure that the build environment is sane. -*- Autoconf -*- + +-# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005 ++# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005, 2008 + # Free Software Foundation, Inc. + # + # This file is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. + +-# serial 4 ++# serial 5 + + # AM_SANITY_CHECK + # --------------- +@@ -847,16 +917,29 @@ + # Just in case + sleep 1 + echo timestamp > conftest.file ++# Reject unsafe characters in $srcdir or the absolute working directory ++# name. Accept space and tab only in the latter. ++am_lf=' ++' ++case `pwd` in ++ *[[\\\"\#\$\&\'\`$am_lf]]*) ++ AC_MSG_ERROR([unsafe absolute working directory name]);; ++esac ++case $srcdir in ++ *[[\\\"\#\$\&\'\`$am_lf\ \ ]]*) ++ AC_MSG_ERROR([unsafe srcdir value: `$srcdir']);; ++esac ++ + # Do `set' in a subshell so we don't clobber the current shell's + # arguments. Must try -L first in case configure is actually a + # symlink; some systems play weird games with the mod time of symlinks + # (eg FreeBSD returns the mod time of the symlink's containing + # directory). + if ( +- set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null` ++ set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` + if test "$[*]" = "X"; then + # -L didn't work. +- set X `ls -t $srcdir/configure conftest.file` ++ set X `ls -t "$srcdir/configure" conftest.file` + fi + rm -f conftest.file + if test "$[*]" != "X $srcdir/configure conftest.file" \ +@@ -906,9 +989,28 @@ + if test "$cross_compiling" != no; then + AC_CHECK_TOOL([STRIP], [strip], :) + fi +-INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s" ++INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" + AC_SUBST([INSTALL_STRIP_PROGRAM])]) + ++# Copyright (C) 2006, 2008 Free Software Foundation, Inc. ++# ++# This file is free software; the Free Software Foundation ++# gives unlimited permission to copy and/or distribute it, ++# with or without modifications, as long as this notice is preserved. ++ ++# serial 2 ++ ++# _AM_SUBST_NOTMAKE(VARIABLE) ++# --------------------------- ++# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in. ++# This macro is traced by Automake. ++AC_DEFUN([_AM_SUBST_NOTMAKE]) ++ ++# AM_SUBST_NOTMAKE(VARIABLE) ++# --------------------------- ++# Public sister of _AM_SUBST_NOTMAKE. ++AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) ++ + # Check how to create a tarball. -*- Autoconf -*- + + # Copyright (C) 2004, 2005 Free Software Foundation, Inc. +diff -Nur exmap-console-0.4.1.orig/configure exmap-console-0.4.1/configure +--- exmap-console-0.4.1.orig/configure 2007-02-26 12:44:00.000000000 +0100 ++++ exmap-console-0.4.1/configure 2011-01-11 12:44:16.000000000 +0100 +@@ -1,58 +1,85 @@ + #! /bin/sh + # Guess values for system-dependent variables and create Makefiles. +-# Generated by GNU Autoconf 2.60 for exmap-console 0.4.1. ++# Generated by GNU Autoconf 2.68 for exmap-console 0.4.1. + # + # Report bugs to <tf@o-hand.com>. + # ++# + # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, +-# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ++# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software ++# Foundation, Inc. ++# ++# + # This configure script is free software; the Free Software Foundation + # gives unlimited permission to copy, distribute and modify it. +-## --------------------- ## +-## M4sh Initialization. ## +-## --------------------- ## ++## -------------------- ## ++## M4sh Initialization. ## ++## -------------------- ## + +-# Be Bourne compatible +-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then ++# Be more Bourne compatible ++DUALCASE=1; export DUALCASE # for MKS sh ++if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then : + emulate sh + NULLCMD=: +- # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which ++ # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which + # is contrary to our usage. Disable this feature. + alias -g '${1+"$@"}'='"$@"' + setopt NO_GLOB_SUBST + else +- case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac ++ case `(set -o) 2>/dev/null` in #( ++ *posix*) : ++ set -o posix ;; #( ++ *) : ++ ;; ++esac + fi +-BIN_SH=xpg4; export BIN_SH # for Tru64 +-DUALCASE=1; export DUALCASE # for MKS sh +- + +-# PATH needs CR +-# Avoid depending upon Character Ranges. +-as_cr_letters='abcdefghijklmnopqrstuvwxyz' +-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' +-as_cr_Letters=$as_cr_letters$as_cr_LETTERS +-as_cr_digits='0123456789' +-as_cr_alnum=$as_cr_Letters$as_cr_digits + +-# The user is always right. +-if test "${PATH_SEPARATOR+set}" != set; then +- echo "#! /bin/sh" >conf$$.sh +- echo "exit 0" >>conf$$.sh +- chmod +x conf$$.sh +- if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then +- PATH_SEPARATOR=';' ++as_nl=' ++' ++export as_nl ++# Printing a long string crashes Solaris 7 /usr/bin/printf. ++as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' ++as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo ++as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo ++# Prefer a ksh shell builtin over an external printf program on Solaris, ++# but without wasting forks for bash or zsh. ++if test -z "$BASH_VERSION$ZSH_VERSION" \ ++ && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then ++ as_echo='print -r --' ++ as_echo_n='print -rn --' ++elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then ++ as_echo='printf %s\n' ++ as_echo_n='printf %s' ++else ++ if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then ++ as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"' ++ as_echo_n='/usr/ucb/echo -n' + else +- PATH_SEPARATOR=: ++ as_echo_body='eval expr "X$1" : "X\\(.*\\)"' ++ as_echo_n_body='eval ++ arg=$1; ++ case $arg in #( ++ *"$as_nl"*) ++ expr "X$arg" : "X\\(.*\\)$as_nl"; ++ arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;; ++ esac; ++ expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl" ++ ' ++ export as_echo_n_body ++ as_echo_n='sh -c $as_echo_n_body as_echo' + fi +- rm -f conf$$.sh ++ export as_echo_body ++ as_echo='sh -c $as_echo_body as_echo' + fi + +-# Support unset when possible. +-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then +- as_unset=unset +-else +- as_unset=false ++# The user is always right. ++if test "${PATH_SEPARATOR+set}" != set; then ++ PATH_SEPARATOR=: ++ (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && { ++ (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 || ++ PATH_SEPARATOR=';' ++ } + fi + + +@@ -61,20 +88,19 @@ + # there to prevent editors from complaining about space-tab. + # (If _AS_PATH_WALK were called with IFS unset, it would disable word + # splitting by setting IFS to empty value.) +-as_nl=' +-' + IFS=" "" $as_nl" + + # Find who we are. Look in the path if we contain no directory separator. +-case $0 in ++as_myself= ++case $0 in #(( + *[\\/]* ) as_myself=$0 ;; + *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + for as_dir in $PATH + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break +-done ++ test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break ++ done + IFS=$as_save_IFS + + ;; +@@ -85,352 +111,328 @@ + as_myself=$0 + fi + if test ! -f "$as_myself"; then +- echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 +- { (exit 1); exit 1; } ++ $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 ++ exit 1 + fi + +-# Work around bugs in pre-3.0 UWIN ksh. +-for as_var in ENV MAIL MAILPATH +-do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var ++# Unset variables that we do not need and which cause bugs (e.g. in ++# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1" ++# suppresses any "Segmentation fault" message there. '((' could ++# trigger a bug in pdksh 5.2.14. ++for as_var in BASH_ENV ENV MAIL MAILPATH ++do eval test x\${$as_var+set} = xset \ ++ && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || : + done + PS1='$ ' + PS2='> ' + PS4='+ ' + + # NLS nuisances. +-for as_var in \ +- LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \ +- LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \ +- LC_TELEPHONE LC_TIME +-do +- if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then +- eval $as_var=C; export $as_var +- else +- ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var +- fi +-done +- +-# Required to use basename. +-if expr a : '\(a\)' >/dev/null 2>&1 && +- test "X`expr 00001 : '.*\(...\)'`" = X001; then +- as_expr=expr +-else +- as_expr=false +-fi +- +-if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then +- as_basename=basename +-else +- as_basename=false +-fi +- +- +-# Name of the executable. +-as_me=`$as_basename -- "$0" || +-$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ +- X"$0" : 'X\(//\)$' \| \ +- X"$0" : 'X\(/\)' \| . 2>/dev/null || +-echo X/"$0" | +- sed '/^.*\/\([^/][^/]*\)\/*$/{ +- s//\1/ +- q +- } +- /^X\/\(\/\/\)$/{ +- s//\1/ +- q +- } +- /^X\/\(\/\).*/{ +- s//\1/ +- q +- } +- s/.*/./; q'` ++LC_ALL=C ++export LC_ALL ++LANGUAGE=C ++export LANGUAGE + + # CDPATH. +-$as_unset CDPATH +- ++(unset CDPATH) >/dev/null 2>&1 && unset CDPATH + + if test "x$CONFIG_SHELL" = x; then +- if (eval ":") 2>/dev/null; then +- as_have_required=yes ++ as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then : ++ emulate sh ++ NULLCMD=: ++ # Pre-4.2 versions of Zsh do word splitting on \${1+\"\$@\"}, which ++ # is contrary to our usage. Disable this feature. ++ alias -g '\${1+\"\$@\"}'='\"\$@\"' ++ setopt NO_GLOB_SUBST + else +- as_have_required=no ++ case \`(set -o) 2>/dev/null\` in #( ++ *posix*) : ++ set -o posix ;; #( ++ *) : ++ ;; ++esac + fi +- +- if test $as_have_required = yes && (eval ": +-(as_func_return () { +- (exit \$1) +-} +-as_func_success () { +- as_func_return 0 +-} +-as_func_failure () { +- as_func_return 1 +-} +-as_func_ret_success () { +- return 0 +-} +-as_func_ret_failure () { +- return 1 +-} ++" ++ as_required="as_fn_return () { (exit \$1); } ++as_fn_success () { as_fn_return 0; } ++as_fn_failure () { as_fn_return 1; } ++as_fn_ret_success () { return 0; } ++as_fn_ret_failure () { return 1; } + + exitcode=0 +-if as_func_success; then +- : +-else +- exitcode=1 +- echo as_func_success failed. +-fi +- +-if as_func_failure; then +- exitcode=1 +- echo as_func_failure succeeded. +-fi ++as_fn_success || { exitcode=1; echo as_fn_success failed.; } ++as_fn_failure && { exitcode=1; echo as_fn_failure succeeded.; } ++as_fn_ret_success || { exitcode=1; echo as_fn_ret_success failed.; } ++as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; } ++if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then : + +-if as_func_ret_success; then +- : + else +- exitcode=1 +- echo as_func_ret_success failed. +-fi +- +-if as_func_ret_failure; then +- exitcode=1 +- echo as_func_ret_failure succeeded. +-fi +- +-if ( set x; as_func_ret_success y && test x = \"\$1\" ); then +- : ++ exitcode=1; echo positional parameters were not saved. ++fi ++test x\$exitcode = x0 || exit 1" ++ as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO ++ as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO ++ eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" && ++ test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1" ++ if (eval "$as_required") 2>/dev/null; then : ++ as_have_required=yes + else +- exitcode=1 +- echo positional parameters were not saved. ++ as_have_required=no + fi ++ if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null; then : + +-test \$exitcode = 0) || { (exit 1); exit 1; } +- +-( +- as_lineno_1=\$LINENO +- as_lineno_2=\$LINENO +- test \"x\$as_lineno_1\" != \"x\$as_lineno_2\" && +- test \"x\`expr \$as_lineno_1 + 1\`\" = \"x\$as_lineno_2\") || { (exit 1); exit 1; } +-") 2> /dev/null; then +- : +-else +- as_candidate_shells= +- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +-for as_dir in /usr/bin/posix$PATH_SEPARATOR/bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH ++else ++ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++as_found=false ++for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- case $as_dir in ++ as_found=: ++ case $as_dir in #( + /*) + for as_base in sh bash ksh sh5; do +- as_candidate_shells="$as_candidate_shells $as_dir/$as_base" ++ # Try only shells that exist, to save several forks. ++ as_shell=$as_dir/$as_base ++ if { test -f "$as_shell" || test -f "$as_shell.exe"; } && ++ { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$as_shell"; } 2>/dev/null; then : ++ CONFIG_SHELL=$as_shell as_have_required=yes ++ if { $as_echo "$as_bourne_compatible""$as_suggested" | as_run=a "$as_shell"; } 2>/dev/null; then : ++ break 2 ++fi ++fi + done;; + esac ++ as_found=false + done ++$as_found || { if { test -f "$SHELL" || test -f "$SHELL.exe"; } && ++ { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$SHELL"; } 2>/dev/null; then : ++ CONFIG_SHELL=$SHELL as_have_required=yes ++fi; } + IFS=$as_save_IFS + + +- for as_shell in $as_candidate_shells $SHELL; do +- # Try only shells that exist, to save several forks. +- if { test -f "$as_shell" || test -f "$as_shell.exe"; } && +- { ("$as_shell") 2> /dev/null <<\_ASEOF +-# Be Bourne compatible +-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then +- emulate sh +- NULLCMD=: +- # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which +- # is contrary to our usage. Disable this feature. +- alias -g '${1+"$@"}'='"$@"' +- setopt NO_GLOB_SUBST +-else +- case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac +-fi +-BIN_SH=xpg4; export BIN_SH # for Tru64 +-DUALCASE=1; export DUALCASE # for MKS sh +- +-: +-_ASEOF +-}; then +- CONFIG_SHELL=$as_shell +- as_have_required=yes +- if { "$as_shell" 2> /dev/null <<\_ASEOF +-# Be Bourne compatible +-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then +- emulate sh +- NULLCMD=: +- # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which +- # is contrary to our usage. Disable this feature. +- alias -g '${1+"$@"}'='"$@"' +- setopt NO_GLOB_SUBST +-else +- case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac +-fi +-BIN_SH=xpg4; export BIN_SH # for Tru64 +-DUALCASE=1; export DUALCASE # for MKS sh +- +-: +-(as_func_return () { +- (exit $1) +-} +-as_func_success () { +- as_func_return 0 +-} +-as_func_failure () { +- as_func_return 1 +-} +-as_func_ret_success () { +- return 0 +-} +-as_func_ret_failure () { +- return 1 +-} +- +-exitcode=0 +-if as_func_success; then +- : +-else +- exitcode=1 +- echo as_func_success failed. +-fi +- +-if as_func_failure; then +- exitcode=1 +- echo as_func_failure succeeded. +-fi +- +-if as_func_ret_success; then +- : +-else +- exitcode=1 +- echo as_func_ret_success failed. +-fi +- +-if as_func_ret_failure; then +- exitcode=1 +- echo as_func_ret_failure succeeded. +-fi +- +-if ( set x; as_func_ret_success y && test x = "$1" ); then +- : +-else +- exitcode=1 +- echo positional parameters were not saved. ++ if test "x$CONFIG_SHELL" != x; then : ++ # We cannot yet assume a decent shell, so we have to provide a ++ # neutralization value for shells without unset; and this also ++ # works around shells that cannot unset nonexistent variables. ++ # Preserve -v and -x to the replacement shell. ++ BASH_ENV=/dev/null ++ ENV=/dev/null ++ (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV ++ export CONFIG_SHELL ++ case $- in # (((( ++ *v*x* | *x*v* ) as_opts=-vx ;; ++ *v* ) as_opts=-v ;; ++ *x* ) as_opts=-x ;; ++ * ) as_opts= ;; ++ esac ++ exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"} + fi + +-test $exitcode = 0) || { (exit 1); exit 1; } +- +-( +- as_lineno_1=$LINENO +- as_lineno_2=$LINENO +- test "x$as_lineno_1" != "x$as_lineno_2" && +- test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2") || { (exit 1); exit 1; } +- +-_ASEOF +-}; then +- break ++ if test x$as_have_required = xno; then : ++ $as_echo "$0: This script requires a shell more modern than all" ++ $as_echo "$0: the shells that I found on your system." ++ if test x${ZSH_VERSION+set} = xset ; then ++ $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should" ++ $as_echo "$0: be upgraded to zsh 4.3.4 or later." ++ else ++ $as_echo "$0: Please tell bug-autoconf@gnu.org and tf@o-hand.com ++$0: about your system, including any error possibly output ++$0: before this message. Then install a modern shell, or ++$0: manually run the script under such a shell if you do ++$0: have one." ++ fi ++ exit 1 + fi +- + fi +- +- done +- +- if test "x$CONFIG_SHELL" != x; then +- for as_var in BASH_ENV ENV +- do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var +- done +- export CONFIG_SHELL +- exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"} + fi ++SHELL=${CONFIG_SHELL-/bin/sh} ++export SHELL ++# Unset more variables known to interfere with behavior of common tools. ++CLICOLOR_FORCE= GREP_OPTIONS= ++unset CLICOLOR_FORCE GREP_OPTIONS + ++## --------------------- ## ++## M4sh Shell Functions. ## ++## --------------------- ## ++# as_fn_unset VAR ++# --------------- ++# Portably unset VAR. ++as_fn_unset () ++{ ++ { eval $1=; unset $1;} ++} ++as_unset=as_fn_unset + +- if test $as_have_required = no; then +- echo This script requires a shell more modern than all the +- echo shells that I found on your system. Please install a +- echo modern shell, or manually run the script under such a +- echo shell if you do have one. +- { (exit 1); exit 1; } +-fi ++# as_fn_set_status STATUS ++# ----------------------- ++# Set $? to STATUS, without forking. ++as_fn_set_status () ++{ ++ return $1 ++} # as_fn_set_status + ++# as_fn_exit STATUS ++# ----------------- ++# Exit the shell with STATUS, even in a "trap 0" or "set -e" context. ++as_fn_exit () ++{ ++ set +e ++ as_fn_set_status $1 ++ exit $1 ++} # as_fn_exit ++ ++# as_fn_mkdir_p ++# ------------- ++# Create "$as_dir" as a directory, including parents if necessary. ++as_fn_mkdir_p () ++{ + +-fi ++ case $as_dir in #( ++ -*) as_dir=./$as_dir;; ++ esac ++ test -d "$as_dir" || eval $as_mkdir_p || { ++ as_dirs= ++ while :; do ++ case $as_dir in #( ++ *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( ++ *) as_qdir=$as_dir;; ++ esac ++ as_dirs="'$as_qdir' $as_dirs" ++ as_dir=`$as_dirname -- "$as_dir" || ++$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ ++ X"$as_dir" : 'X\(//\)[^/]' \| \ ++ X"$as_dir" : 'X\(//\)$' \| \ ++ X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || ++$as_echo X"$as_dir" | ++ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ ++ s//\1/ ++ q ++ } ++ /^X\(\/\/\)[^/].*/{ ++ s//\1/ ++ q ++ } ++ /^X\(\/\/\)$/{ ++ s//\1/ ++ q ++ } ++ /^X\(\/\).*/{ ++ s//\1/ ++ q ++ } ++ s/.*/./; q'` ++ test -d "$as_dir" && break ++ done ++ test -z "$as_dirs" || eval "mkdir $as_dirs" ++ } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir" + +-fi + ++} # as_fn_mkdir_p ++# as_fn_append VAR VALUE ++# ---------------------- ++# Append the text in VALUE to the end of the definition contained in VAR. Take ++# advantage of any shell optimizations that allow amortized linear growth over ++# repeated appends, instead of the typical quadratic growth present in naive ++# implementations. ++if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then : ++ eval 'as_fn_append () ++ { ++ eval $1+=\$2 ++ }' ++else ++ as_fn_append () ++ { ++ eval $1=\$$1\$2 ++ } ++fi # as_fn_append ++ ++# as_fn_arith ARG... ++# ------------------ ++# Perform arithmetic evaluation on the ARGs, and store the result in the ++# global $as_val. Take advantage of shells that can avoid forks. The arguments ++# must be portable across $(()) and expr. ++if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then : ++ eval 'as_fn_arith () ++ { ++ as_val=$(( $* )) ++ }' ++else ++ as_fn_arith () ++ { ++ as_val=`expr "$@" || test $? -eq 1` ++ } ++fi # as_fn_arith + + +-(eval "as_func_return () { +- (exit \$1) +-} +-as_func_success () { +- as_func_return 0 +-} +-as_func_failure () { +- as_func_return 1 +-} +-as_func_ret_success () { +- return 0 +-} +-as_func_ret_failure () { +- return 1 +-} ++# as_fn_error STATUS ERROR [LINENO LOG_FD] ++# ---------------------------------------- ++# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are ++# provided, also output the error to LOG_FD, referencing LINENO. Then exit the ++# script with STATUS, using 1 if that was 0. ++as_fn_error () ++{ ++ as_status=$1; test $as_status -eq 0 && as_status=1 ++ if test "$4"; then ++ as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack ++ $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 ++ fi ++ $as_echo "$as_me: error: $2" >&2 ++ as_fn_exit $as_status ++} # as_fn_error + +-exitcode=0 +-if as_func_success; then +- : ++if expr a : '\(a\)' >/dev/null 2>&1 && ++ test "X`expr 00001 : '.*\(...\)'`" = X001; then ++ as_expr=expr + else +- exitcode=1 +- echo as_func_success failed. +-fi +- +-if as_func_failure; then +- exitcode=1 +- echo as_func_failure succeeded. ++ as_expr=false + fi + +-if as_func_ret_success; then +- : ++if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then ++ as_basename=basename + else +- exitcode=1 +- echo as_func_ret_success failed. +-fi +- +-if as_func_ret_failure; then +- exitcode=1 +- echo as_func_ret_failure succeeded. ++ as_basename=false + fi + +-if ( set x; as_func_ret_success y && test x = \"\$1\" ); then +- : ++if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then ++ as_dirname=dirname + else +- exitcode=1 +- echo positional parameters were not saved. ++ as_dirname=false + fi + +-test \$exitcode = 0") || { +- echo No shell found that supports shell functions. +- echo Please tell autoconf@gnu.org about your system, +- echo including any error possibly output before this +- echo message +-} ++as_me=`$as_basename -- "$0" || ++$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ ++ X"$0" : 'X\(//\)$' \| \ ++ X"$0" : 'X\(/\)' \| . 2>/dev/null || ++$as_echo X/"$0" | ++ sed '/^.*\/\([^/][^/]*\)\/*$/{ ++ s//\1/ ++ q ++ } ++ /^X\/\(\/\/\)$/{ ++ s//\1/ ++ q ++ } ++ /^X\/\(\/\).*/{ ++ s//\1/ ++ q ++ } ++ s/.*/./; q'` + ++# Avoid depending upon Character Ranges. ++as_cr_letters='abcdefghijklmnopqrstuvwxyz' ++as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' ++as_cr_Letters=$as_cr_letters$as_cr_LETTERS ++as_cr_digits='0123456789' ++as_cr_alnum=$as_cr_Letters$as_cr_digits + + +- as_lineno_1=$LINENO +- as_lineno_2=$LINENO +- test "x$as_lineno_1" != "x$as_lineno_2" && +- test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || { +- +- # Create $as_me.lineno as a copy of $as_myself, but with $LINENO +- # uniformly replaced by the line number. The first 'sed' inserts a +- # line-number line after each line using $LINENO; the second 'sed' +- # does the real work. The second script uses 'N' to pair each +- # line-number line with the line containing $LINENO, and appends +- # trailing '-' during substitution so that $LINENO is not a special +- # case at line end. +- # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the +- # scripts with optimization help from Paolo Bonzini. Blame Lee +- # E. McMahon (1931-1989) for sed's syntax. :-) ++ as_lineno_1=$LINENO as_lineno_1a=$LINENO ++ as_lineno_2=$LINENO as_lineno_2a=$LINENO ++ eval 'test "x$as_lineno_1'$as_run'" != "x$as_lineno_2'$as_run'" && ++ test "x`expr $as_lineno_1'$as_run' + 1`" = "x$as_lineno_2'$as_run'"' || { ++ # Blame Lee E. McMahon (1931-1989) for sed's syntax. :-) + sed -n ' + p + /[$]LINENO/= +@@ -447,8 +449,7 @@ + s/-\n.*// + ' >$as_me.lineno && + chmod +x "$as_me.lineno" || +- { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2 +- { (exit 1); exit 1; }; } ++ { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; } + + # Don't try to exec as it changes $[0], causing all sort of problems + # (the dirname of $[0] is not the place where we might find the +@@ -458,49 +459,40 @@ + exit + } + +- +-if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then +- as_dirname=dirname +-else +- as_dirname=false +-fi +- + ECHO_C= ECHO_N= ECHO_T= +-case `echo -n x` in ++case `echo -n x` in #((((( + -n*) +- case `echo 'x\c'` in ++ case `echo 'xy\c'` in + *c*) ECHO_T=' ';; # ECHO_T is single tab character. +- *) ECHO_C='\c';; ++ xy) ECHO_C='\c';; ++ *) echo `echo ksh88 bug on AIX 6.1` > /dev/null ++ ECHO_T=' ';; + esac;; + *) + ECHO_N='-n';; + esac + +-if expr a : '\(a\)' >/dev/null 2>&1 && +- test "X`expr 00001 : '.*\(...\)'`" = X001; then +- as_expr=expr +-else +- as_expr=false +-fi +- + rm -f conf$$ conf$$.exe conf$$.file + if test -d conf$$.dir; then + rm -f conf$$.dir/conf$$.file + else + rm -f conf$$.dir +- mkdir conf$$.dir ++ mkdir conf$$.dir 2>/dev/null + fi +-echo >conf$$.file +-if ln -s conf$$.file conf$$ 2>/dev/null; then +- as_ln_s='ln -s' +- # ... but there are two gotchas: +- # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. +- # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. +- # In both cases, we have to default to `cp -p'. +- ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || ++if (echo >conf$$.file) 2>/dev/null; then ++ if ln -s conf$$.file conf$$ 2>/dev/null; then ++ as_ln_s='ln -s' ++ # ... but there are two gotchas: ++ # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. ++ # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. ++ # In both cases, we have to default to `cp -p'. ++ ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || ++ as_ln_s='cp -p' ++ elif ln conf$$.file conf$$ 2>/dev/null; then ++ as_ln_s=ln ++ else + as_ln_s='cp -p' +-elif ln conf$$.file conf$$ 2>/dev/null; then +- as_ln_s=ln ++ fi + else + as_ln_s='cp -p' + fi +@@ -508,25 +500,34 @@ + rmdir conf$$.dir 2>/dev/null + + if mkdir -p . 2>/dev/null; then +- as_mkdir_p=: ++ as_mkdir_p='mkdir -p "$as_dir"' + else + test -d ./-p && rmdir ./-p + as_mkdir_p=false + fi + +-# Find out whether ``test -x'' works. Don't use a zero-byte file, as +-# systems may use methods other than mode bits to determine executability. +-cat >conf$$.file <<_ASEOF +-#! /bin/sh +-exit 0 +-_ASEOF +-chmod +x conf$$.file +-if test -x conf$$.file >/dev/null 2>&1; then +- as_executable_p="test -x" ++if test -x / >/dev/null 2>&1; then ++ as_test_x='test -x' + else +- as_executable_p=: ++ if ls -dL / >/dev/null 2>&1; then ++ as_ls_L_option=L ++ else ++ as_ls_L_option= ++ fi ++ as_test_x=' ++ eval sh -c '\'' ++ if test -d "$1"; then ++ test -d "$1/."; ++ else ++ case $1 in #( ++ -*)set "./$1";; ++ esac; ++ case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( ++ ???[sx]*):;;*)false;;esac;fi ++ '\'' sh ++ ' + fi +-rm -f conf$$.file ++as_executable_p=$as_test_x + + # Sed expression to map a string onto a valid CPP name. + as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" +@@ -535,11 +536,11 @@ + as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" + + +- +-exec 7<&0 </dev/null 6>&1 ++test -n "$DJDIR" || exec 7<&0 </dev/null ++exec 6>&1 + + # Name of the host. +-# hostname on some systems (SVR3.2, Linux) returns a bogus exit status, ++# hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status, + # so uname gets run too. + ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q` + +@@ -554,7 +555,6 @@ + subdirs= + MFLAGS= + MAKEFLAGS= +-SHELL=${CONFIG_SHELL-/bin/sh} + + # Identity of this package. + PACKAGE_NAME='exmap-console' +@@ -562,106 +562,128 @@ + PACKAGE_VERSION='0.4.1' + PACKAGE_STRING='exmap-console 0.4.1' + PACKAGE_BUGREPORT='tf@o-hand.com' ++PACKAGE_URL='' + + ac_unique_file="src/exmap.c" +-ac_subst_vars='SHELL +-PATH_SEPARATOR +-PACKAGE_NAME +-PACKAGE_TARNAME +-PACKAGE_VERSION +-PACKAGE_STRING +-PACKAGE_BUGREPORT +-exec_prefix +-prefix +-program_transform_name +-bindir +-sbindir +-libexecdir +-datarootdir +-datadir +-sysconfdir +-sharedstatedir +-localstatedir +-includedir +-oldincludedir +-docdir +-infodir +-htmldir +-dvidir +-pdfdir +-psdir +-libdir +-localedir +-mandir +-DEFS +-ECHO_C +-ECHO_N +-ECHO_T +-LIBS ++ac_subst_vars='am__EXEEXT_FALSE ++am__EXEEXT_TRUE ++LTLIBOBJS ++LIBOBJS ++GCC_CFLAGS ++HAVE_HELPTOMAN_FALSE ++HAVE_HELPTOMAN_TRUE ++HELPTOMAN ++GLIB_LIBS ++GLIB_CFLAGS ++PKG_CONFIG_LIBDIR ++PKG_CONFIG_PATH ++PKG_CONFIG ++DODOCS_FALSE ++DODOCS_TRUE ++READLINE_CFLAGS ++READLINE_LIBS ++INTERACTIVE_FALSE ++INTERACTIVE_TRUE ++am__fastdepCC_FALSE ++am__fastdepCC_TRUE ++CCDEPMODE ++AMDEPBACKSLASH ++AMDEP_FALSE ++AMDEP_TRUE ++am__quote ++am__include ++DEPDIR ++OBJEXT ++EXEEXT ++ac_ct_CC ++CPPFLAGS ++LDFLAGS ++CFLAGS ++CC ++am__untar ++am__tar ++AMTAR ++am__leading_dot ++SET_MAKE ++AWK ++mkdir_p ++MKDIR_P ++INSTALL_STRIP_PROGRAM ++STRIP ++install_sh ++MAKEINFO ++AUTOHEADER ++AUTOMAKE ++AUTOCONF ++ACLOCAL ++VERSION ++PACKAGE ++CYGPATH_W ++am__isrc ++INSTALL_DATA ++INSTALL_SCRIPT ++INSTALL_PROGRAM ++target_alias ++host_alias + build_alias ++LIBS ++ECHO_T ++ECHO_N ++ECHO_C ++DEFS ++mandir ++localedir ++libdir ++psdir ++pdfdir ++dvidir ++htmldir ++infodir ++docdir ++oldincludedir ++includedir ++localstatedir ++sharedstatedir ++sysconfdir ++datadir ++datarootdir ++libexecdir ++sbindir ++bindir ++program_transform_name ++prefix ++exec_prefix ++PACKAGE_URL ++PACKAGE_BUGREPORT ++PACKAGE_STRING ++PACKAGE_VERSION ++PACKAGE_TARNAME ++PACKAGE_NAME ++PATH_SEPARATOR ++SHELL' ++ac_subst_files='' ++ac_user_opts=' ++enable_option_checking ++with_readline ++enable_dependency_tracking ++enable_doc ++with_help2man ++' ++ ac_precious_vars='build_alias + host_alias + target_alias +-INSTALL_PROGRAM +-INSTALL_SCRIPT +-INSTALL_DATA +-CYGPATH_W +-PACKAGE +-VERSION +-ACLOCAL +-AUTOCONF +-AUTOMAKE +-AUTOHEADER +-MAKEINFO +-install_sh +-STRIP +-INSTALL_STRIP_PROGRAM +-mkdir_p +-AWK +-SET_MAKE +-am__leading_dot +-AMTAR +-am__tar +-am__untar + CC + CFLAGS + LDFLAGS ++LIBS + CPPFLAGS +-ac_ct_CC +-EXEEXT +-OBJEXT +-DEPDIR +-am__include +-am__quote +-AMDEP_TRUE +-AMDEP_FALSE +-AMDEPBACKSLASH +-CCDEPMODE +-am__fastdepCC_TRUE +-am__fastdepCC_FALSE +-INTERACTIVE_TRUE +-INTERACTIVE_FALSE +-READLINE_LIBS +-READLINE_CFLAGS +-DODOCS_TRUE +-DODOCS_FALSE +-PKG_CONFIG +-GLIB_CFLAGS +-GLIB_LIBS +-HELPTOMAN +-HAVE_HELPTOMAN_TRUE +-HAVE_HELPTOMAN_FALSE +-GCC_CFLAGS +-LIBOBJS +-LTLIBOBJS' +-ac_subst_files='' +- ac_precious_vars='build_alias +-host_alias +-target_alias + CC +-CFLAGS + LDFLAGS ++LIBS + CPPFLAGS + PKG_CONFIG ++PKG_CONFIG_PATH ++PKG_CONFIG_LIBDIR + GLIB_CFLAGS + GLIB_LIBS' + +@@ -669,6 +691,8 @@ + # Initialize some variables set by options. + ac_init_help= + ac_init_version=false ++ac_unrecognized_opts= ++ac_unrecognized_sep= + # The variables have the same names as the options, with + # dashes changed to underlines. + cache_file=/dev/null +@@ -724,8 +748,9 @@ + fi + + case $ac_option in +- *=*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;; +- *) ac_optarg=yes ;; ++ *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;; ++ *=) ac_optarg= ;; ++ *) ac_optarg=yes ;; + esac + + # Accept the important Cygnus configure options, so we can diagnose typos. +@@ -767,13 +792,20 @@ + datarootdir=$ac_optarg ;; + + -disable-* | --disable-*) +- ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'` ++ ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'` + # Reject names that are not valid shell variable names. +- expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null && +- { echo "$as_me: error: invalid feature name: $ac_feature" >&2 +- { (exit 1); exit 1; }; } +- ac_feature=`echo $ac_feature | sed 's/-/_/g'` +- eval enable_$ac_feature=no ;; ++ expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && ++ as_fn_error $? "invalid feature name: $ac_useropt" ++ ac_useropt_orig=$ac_useropt ++ ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` ++ case $ac_user_opts in ++ *" ++"enable_$ac_useropt" ++"*) ;; ++ *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--disable-$ac_useropt_orig" ++ ac_unrecognized_sep=', ';; ++ esac ++ eval enable_$ac_useropt=no ;; + + -docdir | --docdir | --docdi | --doc | --do) + ac_prev=docdir ;; +@@ -786,13 +818,20 @@ + dvidir=$ac_optarg ;; + + -enable-* | --enable-*) +- ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` ++ ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` + # Reject names that are not valid shell variable names. +- expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null && +- { echo "$as_me: error: invalid feature name: $ac_feature" >&2 +- { (exit 1); exit 1; }; } +- ac_feature=`echo $ac_feature | sed 's/-/_/g'` +- eval enable_$ac_feature=\$ac_optarg ;; ++ expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && ++ as_fn_error $? "invalid feature name: $ac_useropt" ++ ac_useropt_orig=$ac_useropt ++ ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` ++ case $ac_user_opts in ++ *" ++"enable_$ac_useropt" ++"*) ;; ++ *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--enable-$ac_useropt_orig" ++ ac_unrecognized_sep=', ';; ++ esac ++ eval enable_$ac_useropt=\$ac_optarg ;; + + -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \ + | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \ +@@ -983,22 +1022,36 @@ + ac_init_version=: ;; + + -with-* | --with-*) +- ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` ++ ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` + # Reject names that are not valid shell variable names. +- expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null && +- { echo "$as_me: error: invalid package name: $ac_package" >&2 +- { (exit 1); exit 1; }; } +- ac_package=`echo $ac_package| sed 's/-/_/g'` +- eval with_$ac_package=\$ac_optarg ;; ++ expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && ++ as_fn_error $? "invalid package name: $ac_useropt" ++ ac_useropt_orig=$ac_useropt ++ ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` ++ case $ac_user_opts in ++ *" ++"with_$ac_useropt" ++"*) ;; ++ *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--with-$ac_useropt_orig" ++ ac_unrecognized_sep=', ';; ++ esac ++ eval with_$ac_useropt=\$ac_optarg ;; + + -without-* | --without-*) +- ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'` ++ ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'` + # Reject names that are not valid shell variable names. +- expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null && +- { echo "$as_me: error: invalid package name: $ac_package" >&2 +- { (exit 1); exit 1; }; } +- ac_package=`echo $ac_package | sed 's/-/_/g'` +- eval with_$ac_package=no ;; ++ expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && ++ as_fn_error $? "invalid package name: $ac_useropt" ++ ac_useropt_orig=$ac_useropt ++ ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` ++ case $ac_user_opts in ++ *" ++"with_$ac_useropt" ++"*) ;; ++ *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--without-$ac_useropt_orig" ++ ac_unrecognized_sep=', ';; ++ esac ++ eval with_$ac_useropt=no ;; + + --x) + # Obsolete; use --with-x. +@@ -1018,26 +1071,26 @@ + | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*) + x_libraries=$ac_optarg ;; + +- -*) { echo "$as_me: error: unrecognized option: $ac_option +-Try \`$0 --help' for more information." >&2 +- { (exit 1); exit 1; }; } ++ -*) as_fn_error $? "unrecognized option: \`$ac_option' ++Try \`$0 --help' for more information" + ;; + + *=*) + ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='` + # Reject names that are not valid shell variable names. +- expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null && +- { echo "$as_me: error: invalid variable name: $ac_envvar" >&2 +- { (exit 1); exit 1; }; } ++ case $ac_envvar in #( ++ '' | [0-9]* | *[!_$as_cr_alnum]* ) ++ as_fn_error $? "invalid variable name: \`$ac_envvar'" ;; ++ esac + eval $ac_envvar=\$ac_optarg + export $ac_envvar ;; + + *) + # FIXME: should be removed in autoconf 3.0. +- echo "$as_me: WARNING: you should use --build, --host, --target" >&2 ++ $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2 + expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null && +- echo "$as_me: WARNING: invalid host type: $ac_option" >&2 +- : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option} ++ $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2 ++ : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}" + ;; + + esac +@@ -1045,23 +1098,36 @@ + + if test -n "$ac_prev"; then + ac_option=--`echo $ac_prev | sed 's/_/-/g'` +- { echo "$as_me: error: missing argument to $ac_option" >&2 +- { (exit 1); exit 1; }; } ++ as_fn_error $? "missing argument to $ac_option" + fi + +-# Be sure to have absolute directory names. ++if test -n "$ac_unrecognized_opts"; then ++ case $enable_option_checking in ++ no) ;; ++ fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;; ++ *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;; ++ esac ++fi ++ ++# Check all directory arguments for consistency. + for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ + datadir sysconfdir sharedstatedir localstatedir includedir \ + oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ + libdir localedir mandir + do + eval ac_val=\$$ac_var ++ # Remove trailing slashes. ++ case $ac_val in ++ */ ) ++ ac_val=`expr "X$ac_val" : 'X\(.*[^/]\)' \| "X$ac_val" : 'X\(.*\)'` ++ eval $ac_var=\$ac_val;; ++ esac ++ # Be sure to have absolute directory names. + case $ac_val in + [\\/$]* | ?:[\\/]* ) continue;; + NONE | '' ) case $ac_var in *prefix ) continue;; esac;; + esac +- { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 +- { (exit 1); exit 1; }; } ++ as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val" + done + + # There might be people who depend on the old broken behavior: `$host' +@@ -1075,8 +1141,8 @@ + if test "x$host_alias" != x; then + if test "x$build_alias" = x; then + cross_compiling=maybe +- echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host. +- If a cross compiler is detected then cross compile mode will be used." >&2 ++ $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host. ++ If a cross compiler is detected then cross compile mode will be used" >&2 + elif test "x$build_alias" != "x$host_alias"; then + cross_compiling=yes + fi +@@ -1091,23 +1157,21 @@ + ac_pwd=`pwd` && test -n "$ac_pwd" && + ac_ls_di=`ls -di .` && + ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` || +- { echo "$as_me: error: Working directory cannot be determined" >&2 +- { (exit 1); exit 1; }; } ++ as_fn_error $? "working directory cannot be determined" + test "X$ac_ls_di" = "X$ac_pwd_ls_di" || +- { echo "$as_me: error: pwd does not report name of working directory" >&2 +- { (exit 1); exit 1; }; } ++ as_fn_error $? "pwd does not report name of working directory" + + + # Find the source files, if location was not specified. + if test -z "$srcdir"; then + ac_srcdir_defaulted=yes + # Try the directory containing this script, then the parent directory. +- ac_confdir=`$as_dirname -- "$0" || +-$as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ +- X"$0" : 'X\(//\)[^/]' \| \ +- X"$0" : 'X\(//\)$' \| \ +- X"$0" : 'X\(/\)' \| . 2>/dev/null || +-echo X"$0" | ++ ac_confdir=`$as_dirname -- "$as_myself" || ++$as_expr X"$as_myself" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ ++ X"$as_myself" : 'X\(//\)[^/]' \| \ ++ X"$as_myself" : 'X\(//\)$' \| \ ++ X"$as_myself" : 'X\(/\)' \| . 2>/dev/null || ++$as_echo X"$as_myself" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q +@@ -1134,13 +1198,11 @@ + fi + if test ! -r "$srcdir/$ac_unique_file"; then + test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .." +- { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2 +- { (exit 1); exit 1; }; } ++ as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir" + fi + ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work" + ac_abs_confdir=`( +- cd "$srcdir" && test -r "./$ac_unique_file" || { echo "$as_me: error: $ac_msg" >&2 +- { (exit 1); exit 1; }; } ++ cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg" + pwd)` + # When building in place, set srcdir=. + if test "$ac_abs_confdir" = "$ac_pwd"; then +@@ -1180,7 +1242,7 @@ + --help=short display options specific to this package + --help=recursive display the short help of all the included packages + -V, --version display version information and exit +- -q, --quiet, --silent do not print \`checking...' messages ++ -q, --quiet, --silent do not print \`checking ...' messages + --cache-file=FILE cache test results in FILE [disabled] + -C, --config-cache alias for \`--cache-file=config.cache' + -n, --no-create do not create output files +@@ -1188,9 +1250,9 @@ + + Installation directories: + --prefix=PREFIX install architecture-independent files in PREFIX +- [$ac_default_prefix] ++ [$ac_default_prefix] + --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX +- [PREFIX] ++ [PREFIX] + + By default, \`make install' will install all the files in + \`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc. You can specify +@@ -1200,25 +1262,25 @@ + For better control, use the options below. + + Fine tuning of the installation directories: +- --bindir=DIR user executables [EPREFIX/bin] +- --sbindir=DIR system admin executables [EPREFIX/sbin] +- --libexecdir=DIR program executables [EPREFIX/libexec] +- --sysconfdir=DIR read-only single-machine data [PREFIX/etc] +- --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] +- --localstatedir=DIR modifiable single-machine data [PREFIX/var] +- --libdir=DIR object code libraries [EPREFIX/lib] +- --includedir=DIR C header files [PREFIX/include] +- --oldincludedir=DIR C header files for non-gcc [/usr/include] +- --datarootdir=DIR read-only arch.-independent data root [PREFIX/share] +- --datadir=DIR read-only architecture-independent data [DATAROOTDIR] +- --infodir=DIR info documentation [DATAROOTDIR/info] +- --localedir=DIR locale-dependent data [DATAROOTDIR/locale] +- --mandir=DIR man documentation [DATAROOTDIR/man] +- --docdir=DIR documentation root [DATAROOTDIR/doc/exmap-console] +- --htmldir=DIR html documentation [DOCDIR] +- --dvidir=DIR dvi documentation [DOCDIR] +- --pdfdir=DIR pdf documentation [DOCDIR] +- --psdir=DIR ps documentation [DOCDIR] ++ --bindir=DIR user executables [EPREFIX/bin] ++ --sbindir=DIR system admin executables [EPREFIX/sbin] ++ --libexecdir=DIR program executables [EPREFIX/libexec] ++ --sysconfdir=DIR read-only single-machine data [PREFIX/etc] ++ --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] ++ --localstatedir=DIR modifiable single-machine data [PREFIX/var] ++ --libdir=DIR object code libraries [EPREFIX/lib] ++ --includedir=DIR C header files [PREFIX/include] ++ --oldincludedir=DIR C header files for non-gcc [/usr/include] ++ --datarootdir=DIR read-only arch.-independent data root [PREFIX/share] ++ --datadir=DIR read-only architecture-independent data [DATAROOTDIR] ++ --infodir=DIR info documentation [DATAROOTDIR/info] ++ --localedir=DIR locale-dependent data [DATAROOTDIR/locale] ++ --mandir=DIR man documentation [DATAROOTDIR/man] ++ --docdir=DIR documentation root [DATAROOTDIR/doc/exmap-console] ++ --htmldir=DIR html documentation [DOCDIR] ++ --dvidir=DIR dvi documentation [DOCDIR] ++ --pdfdir=DIR pdf documentation [DOCDIR] ++ --psdir=DIR ps documentation [DOCDIR] + _ACEOF + + cat <<\_ACEOF +@@ -1237,12 +1299,12 @@ + cat <<\_ACEOF + + Optional Features: ++ --disable-option-checking ignore unrecognized --enable/--with options + --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) + --enable-FEATURE[=ARG] include FEATURE [ARG=yes] + --disable-dependency-tracking speeds up one-time build + --enable-dependency-tracking do not reject slow dependency extractors + --disable-doc Do not build documentation +- --enable-debug Enable debuggin information + + Optional Packages: + --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] +@@ -1255,9 +1317,14 @@ + CFLAGS C compiler flags + LDFLAGS linker flags, e.g. -L<lib dir> if you have libraries in a + nonstandard directory <lib dir> +- CPPFLAGS C/C++/Objective C preprocessor flags, e.g. -I<include dir> if ++ LIBS libraries to pass to the linker, e.g. -l<library> ++ CPPFLAGS (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if + you have headers in a nonstandard directory <include dir> + PKG_CONFIG path to pkg-config utility ++ PKG_CONFIG_PATH ++ directories to add to pkg-config's search path ++ PKG_CONFIG_LIBDIR ++ path overriding pkg-config's built-in search path + GLIB_CFLAGS C compiler flags for GLIB, overriding pkg-config + GLIB_LIBS linker flags for GLIB, overriding pkg-config + +@@ -1272,15 +1339,17 @@ + if test "$ac_init_help" = "recursive"; then + # If there are subdirs, report their specific --help. + for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue +- test -d "$ac_dir" || continue ++ test -d "$ac_dir" || ++ { cd "$srcdir" && ac_pwd=`pwd` && srcdir=. && test -d "$ac_dir"; } || ++ continue + ac_builddir=. + + case "$ac_dir" in + .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; + *) +- ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'` ++ ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'` + # A ".." for each directory in $ac_dir_suffix. +- ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'` ++ ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'` + case $ac_top_builddir_sub in + "") ac_top_builddir_sub=. ac_top_build_prefix= ;; + *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; +@@ -1316,7 +1385,7 @@ + echo && + $SHELL "$ac_srcdir/configure" --help=recursive + else +- echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 ++ $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 + fi || ac_status=$? + cd "$ac_pwd" || { ac_status=$?; break; } + done +@@ -1326,21 +1395,108 @@ + if $ac_init_version; then + cat <<\_ACEOF + exmap-console configure 0.4.1 +-generated by GNU Autoconf 2.60 ++generated by GNU Autoconf 2.68 + +-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, +-2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ++Copyright (C) 2010 Free Software Foundation, Inc. + This configure script is free software; the Free Software Foundation + gives unlimited permission to copy, distribute and modify it. + _ACEOF + exit + fi ++ ++## ------------------------ ## ++## Autoconf initialization. ## ++## ------------------------ ## ++ ++# ac_fn_c_try_compile LINENO ++# -------------------------- ++# Try to compile conftest.$ac_ext, and return whether this succeeded. ++ac_fn_c_try_compile () ++{ ++ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack ++ rm -f conftest.$ac_objext ++ if { { ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" ++$as_echo "$ac_try_echo"; } >&5 ++ (eval "$ac_compile") 2>conftest.err ++ ac_status=$? ++ if test -s conftest.err; then ++ grep -v '^ *+' conftest.err >conftest.er1 ++ cat conftest.er1 >&5 ++ mv -f conftest.er1 conftest.err ++ fi ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest.$ac_objext; then : ++ ac_retval=0 ++else ++ $as_echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_retval=1 ++fi ++ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno ++ as_fn_set_status $ac_retval ++ ++} # ac_fn_c_try_compile ++ ++# ac_fn_c_try_link LINENO ++# ----------------------- ++# Try to link conftest.$ac_ext, and return whether this succeeded. ++ac_fn_c_try_link () ++{ ++ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack ++ rm -f conftest.$ac_objext conftest$ac_exeext ++ if { { ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" ++$as_echo "$ac_try_echo"; } >&5 ++ (eval "$ac_link") 2>conftest.err ++ ac_status=$? ++ if test -s conftest.err; then ++ grep -v '^ *+' conftest.err >conftest.er1 ++ cat conftest.er1 >&5 ++ mv -f conftest.er1 conftest.err ++ fi ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest$ac_exeext && { ++ test "$cross_compiling" = yes || ++ $as_test_x conftest$ac_exeext ++ }; then : ++ ac_retval=0 ++else ++ $as_echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_retval=1 ++fi ++ # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information ++ # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would ++ # interfere with the next link command; also delete a directory that is ++ # left behind by Apple's compiler. We do this before executing the actions. ++ rm -rf conftest.dSYM conftest_ipa8_conftest.oo ++ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno ++ as_fn_set_status $ac_retval ++ ++} # ac_fn_c_try_link + cat >config.log <<_ACEOF + This file contains any messages produced by compilers while + running configure, to aid debugging if configure makes a mistake. + + It was created by exmap-console $as_me 0.4.1, which was +-generated by GNU Autoconf 2.60. Invocation command line was ++generated by GNU Autoconf 2.68. Invocation command line was + + $ $0 $@ + +@@ -1376,8 +1532,8 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- echo "PATH: $as_dir" +-done ++ $as_echo "PATH: $as_dir" ++ done + IFS=$as_save_IFS + + } >&5 +@@ -1411,12 +1567,12 @@ + | -silent | --silent | --silen | --sile | --sil) + continue ;; + *\'*) +- ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; ++ ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; + esac + case $ac_pass in +- 1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;; ++ 1) as_fn_append ac_configure_args0 " '$ac_arg'" ;; + 2) +- ac_configure_args1="$ac_configure_args1 '$ac_arg'" ++ as_fn_append ac_configure_args1 " '$ac_arg'" + if test $ac_must_keep_next = true; then + ac_must_keep_next=false # Got value, back to normal. + else +@@ -1432,13 +1588,13 @@ + -* ) ac_must_keep_next=true ;; + esac + fi +- ac_configure_args="$ac_configure_args '$ac_arg'" ++ as_fn_append ac_configure_args " '$ac_arg'" + ;; + esac + done + done +-$as_unset ac_configure_args0 || test "${ac_configure_args0+set}" != set || { ac_configure_args0=; export ac_configure_args0; } +-$as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_configure_args1=; export ac_configure_args1; } ++{ ac_configure_args0=; unset ac_configure_args0;} ++{ ac_configure_args1=; unset ac_configure_args1;} + + # When interrupted or exit'd, cleanup temporary files, and complete + # config.log. We remove comments because anyway the quotes in there +@@ -1450,11 +1606,9 @@ + { + echo + +- cat <<\_ASBOX +-## ---------------- ## ++ $as_echo "## ---------------- ## + ## Cache variables. ## +-## ---------------- ## +-_ASBOX ++## ---------------- ##" + echo + # The following way of writing the cache mishandles newlines in values, + ( +@@ -1463,12 +1617,13 @@ + case $ac_val in #( + *${as_nl}*) + case $ac_var in #( +- *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5 +-echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;; ++ *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 ++$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; + esac + case $ac_var in #( + _ | IFS | as_nl) ;; #( +- *) $as_unset $ac_var ;; ++ BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #( ++ *) { eval $ac_var=; unset $ac_var;} ;; + esac ;; + esac + done +@@ -1487,128 +1642,136 @@ + ) + echo + +- cat <<\_ASBOX +-## ----------------- ## ++ $as_echo "## ----------------- ## + ## Output variables. ## +-## ----------------- ## +-_ASBOX ++## ----------------- ##" + echo + for ac_var in $ac_subst_vars + do + eval ac_val=\$$ac_var + case $ac_val in +- *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; ++ *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; + esac +- echo "$ac_var='\''$ac_val'\''" ++ $as_echo "$ac_var='\''$ac_val'\''" + done | sort + echo + + if test -n "$ac_subst_files"; then +- cat <<\_ASBOX +-## ------------------- ## ++ $as_echo "## ------------------- ## + ## File substitutions. ## +-## ------------------- ## +-_ASBOX ++## ------------------- ##" + echo + for ac_var in $ac_subst_files + do + eval ac_val=\$$ac_var + case $ac_val in +- *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; ++ *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; + esac +- echo "$ac_var='\''$ac_val'\''" ++ $as_echo "$ac_var='\''$ac_val'\''" + done | sort + echo + fi + + if test -s confdefs.h; then +- cat <<\_ASBOX +-## ----------- ## ++ $as_echo "## ----------- ## + ## confdefs.h. ## +-## ----------- ## +-_ASBOX ++## ----------- ##" + echo + cat confdefs.h + echo + fi + test "$ac_signal" != 0 && +- echo "$as_me: caught signal $ac_signal" +- echo "$as_me: exit $exit_status" ++ $as_echo "$as_me: caught signal $ac_signal" ++ $as_echo "$as_me: exit $exit_status" + } >&5 + rm -f core *.core core.conftest.* && + rm -f -r conftest* confdefs* conf$$* $ac_clean_files && + exit $exit_status + ' 0 + for ac_signal in 1 2 13 15; do +- trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal ++ trap 'ac_signal='$ac_signal'; as_fn_exit 1' $ac_signal + done + ac_signal=0 + + # confdefs.h avoids OS command line length limits that DEFS can exceed. + rm -f -r conftest* confdefs.h + ++$as_echo "/* confdefs.h */" > confdefs.h ++ + # Predefined preprocessor variables. + + cat >>confdefs.h <<_ACEOF + #define PACKAGE_NAME "$PACKAGE_NAME" + _ACEOF + +- + cat >>confdefs.h <<_ACEOF + #define PACKAGE_TARNAME "$PACKAGE_TARNAME" + _ACEOF + +- + cat >>confdefs.h <<_ACEOF + #define PACKAGE_VERSION "$PACKAGE_VERSION" + _ACEOF + +- + cat >>confdefs.h <<_ACEOF + #define PACKAGE_STRING "$PACKAGE_STRING" + _ACEOF + +- + cat >>confdefs.h <<_ACEOF + #define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT" + _ACEOF + ++cat >>confdefs.h <<_ACEOF ++#define PACKAGE_URL "$PACKAGE_URL" ++_ACEOF ++ + + # Let the site file select an alternate cache file if it wants to. +-# Prefer explicitly selected file to automatically selected ones. ++# Prefer an explicitly selected file to automatically selected ones. ++ac_site_file1=NONE ++ac_site_file2=NONE + if test -n "$CONFIG_SITE"; then +- set x "$CONFIG_SITE" ++ # We do not want a PATH search for config.site. ++ case $CONFIG_SITE in #(( ++ -*) ac_site_file1=./$CONFIG_SITE;; ++ */*) ac_site_file1=$CONFIG_SITE;; ++ *) ac_site_file1=./$CONFIG_SITE;; ++ esac + elif test "x$prefix" != xNONE; then +- set x "$prefix/share/config.site" "$prefix/etc/config.site" ++ ac_site_file1=$prefix/share/config.site ++ ac_site_file2=$prefix/etc/config.site + else +- set x "$ac_default_prefix/share/config.site" \ +- "$ac_default_prefix/etc/config.site" ++ ac_site_file1=$ac_default_prefix/share/config.site ++ ac_site_file2=$ac_default_prefix/etc/config.site + fi +-shift +-for ac_site_file ++for ac_site_file in "$ac_site_file1" "$ac_site_file2" + do +- if test -r "$ac_site_file"; then +- { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5 +-echo "$as_me: loading site script $ac_site_file" >&6;} ++ test "x$ac_site_file" = xNONE && continue ++ if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5 ++$as_echo "$as_me: loading site script $ac_site_file" >&6;} + sed 's/^/| /' "$ac_site_file" >&5 +- . "$ac_site_file" ++ . "$ac_site_file" \ ++ || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 ++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} ++as_fn_error $? "failed to load site script $ac_site_file ++See \`config.log' for more details" "$LINENO" 5; } + fi + done + + if test -r "$cache_file"; then +- # Some versions of bash will fail to source /dev/null (special +- # files actually), so we avoid doing that. +- if test -f "$cache_file"; then +- { echo "$as_me:$LINENO: loading cache $cache_file" >&5 +-echo "$as_me: loading cache $cache_file" >&6;} ++ # Some versions of bash will fail to source /dev/null (special files ++ # actually), so we avoid doing that. DJGPP emulates it as a regular file. ++ if test /dev/null != "$cache_file" && test -f "$cache_file"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5 ++$as_echo "$as_me: loading cache $cache_file" >&6;} + case $cache_file in + [\\/]* | ?:[\\/]* ) . "$cache_file";; + *) . "./$cache_file";; + esac + fi + else +- { echo "$as_me:$LINENO: creating cache $cache_file" >&5 +-echo "$as_me: creating cache $cache_file" >&6;} ++ { $as_echo "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5 ++$as_echo "$as_me: creating cache $cache_file" >&6;} + >$cache_file + fi + +@@ -1622,68 +1785,56 @@ + eval ac_new_val=\$ac_env_${ac_var}_value + case $ac_old_set,$ac_new_set in + set,) +- { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 +-echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} ++ { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 ++$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} + ac_cache_corrupted=: ;; + ,set) +- { echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5 +-echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} ++ { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5 ++$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} + ac_cache_corrupted=: ;; + ,);; + *) + if test "x$ac_old_val" != "x$ac_new_val"; then +- { echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5 +-echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} +- { echo "$as_me:$LINENO: former value: $ac_old_val" >&5 +-echo "$as_me: former value: $ac_old_val" >&2;} +- { echo "$as_me:$LINENO: current value: $ac_new_val" >&5 +-echo "$as_me: current value: $ac_new_val" >&2;} +- ac_cache_corrupted=: ++ # differences in whitespace do not lead to failure. ++ ac_old_val_w=`echo x $ac_old_val` ++ ac_new_val_w=`echo x $ac_new_val` ++ if test "$ac_old_val_w" != "$ac_new_val_w"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5 ++$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} ++ ac_cache_corrupted=: ++ else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5 ++$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;} ++ eval $ac_var=\$ac_old_val ++ fi ++ { $as_echo "$as_me:${as_lineno-$LINENO}: former value: \`$ac_old_val'" >&5 ++$as_echo "$as_me: former value: \`$ac_old_val'" >&2;} ++ { $as_echo "$as_me:${as_lineno-$LINENO}: current value: \`$ac_new_val'" >&5 ++$as_echo "$as_me: current value: \`$ac_new_val'" >&2;} + fi;; + esac + # Pass precious variables to config.status. + if test "$ac_new_set" = set; then + case $ac_new_val in +- *\'*) ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;; ++ *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;; + *) ac_arg=$ac_var=$ac_new_val ;; + esac + case " $ac_configure_args " in + *" '$ac_arg' "*) ;; # Avoid dups. Use of quotes ensures accuracy. +- *) ac_configure_args="$ac_configure_args '$ac_arg'" ;; ++ *) as_fn_append ac_configure_args " '$ac_arg'" ;; + esac + fi + done + if $ac_cache_corrupted; then +- { echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5 +-echo "$as_me: error: changes in the environment can compromise the build" >&2;} +- { { echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5 +-echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;} +- { (exit 1); exit 1; }; } +-fi +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- ++ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 ++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} ++ { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5 ++$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;} ++ as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5 ++fi ++## -------------------- ## ++## Main body of script. ## ++## -------------------- ## + + ac_ext=c + ac_cpp='$CPP $CPPFLAGS' +@@ -1694,7 +1845,8 @@ + + + +-am__api_version="1.9" ++am__api_version='1.11' ++ + ac_aux_dir= + for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do + if test -f "$ac_dir/install-sh"; then +@@ -1712,9 +1864,7 @@ + fi + done + if test -z "$ac_aux_dir"; then +- { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&5 +-echo "$as_me: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error $? "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5 + fi + + # These three variables are undocumented and unsupported, +@@ -1739,22 +1889,23 @@ + # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" + # OS/2's system install, which has a completely different semantic + # ./install, which can be erroneously created by make from ./install.sh. +-{ echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5 +-echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6; } ++# Reject install programs that cannot install multiple files. ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5 ++$as_echo_n "checking for a BSD-compatible install... " >&6; } + if test -z "$INSTALL"; then +-if test "${ac_cv_path_install+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++if ${ac_cv_path_install+:} false; then : ++ $as_echo_n "(cached) " >&6 + else + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + for as_dir in $PATH + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- # Account for people who put trailing slashes in PATH elements. +-case $as_dir/ in +- ./ | .// | /cC/* | \ ++ # Account for people who put trailing slashes in PATH elements. ++case $as_dir/ in #(( ++ ./ | .// | /[cC]/* | \ + /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \ +- ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \ ++ ?:[\\/]os2[\\/]install[\\/]* | ?:[\\/]OS2[\\/]INSTALL[\\/]* | \ + /usr/ucb/* ) ;; + *) + # OSF1 and SCO ODT 3.0 have their own names for install. +@@ -1762,7 +1913,7 @@ + # by default. + for ac_prog in ginstall scoinst install; do + for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; }; then ++ if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then + if test $ac_prog = install && + grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then + # AIX install. It has an incompatible calling convention. +@@ -1772,17 +1923,29 @@ + # program-specific install script used by HP pwplus--don't use. + : + else +- ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c" +- break 3 ++ rm -rf conftest.one conftest.two conftest.dir ++ echo one > conftest.one ++ echo two > conftest.two ++ mkdir conftest.dir ++ if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" && ++ test -s conftest.one && test -s conftest.two && ++ test -s conftest.dir/conftest.one && ++ test -s conftest.dir/conftest.two ++ then ++ ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c" ++ break 3 ++ fi + fi + fi + done + done + ;; + esac +-done ++ ++ done + IFS=$as_save_IFS + ++rm -rf conftest.one conftest.two conftest.dir + + fi + if test "${ac_cv_path_install+set}" = set; then +@@ -1795,8 +1958,8 @@ + INSTALL=$ac_install_sh + fi + fi +-{ echo "$as_me:$LINENO: result: $INSTALL" >&5 +-echo "${ECHO_T}$INSTALL" >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5 ++$as_echo "$INSTALL" >&6; } + + # Use test -z because SunOS4 sh mishandles braces in ${var-val}. + # It thinks the first close brace ends the variable substitution. +@@ -1806,21 +1969,34 @@ + + test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' + +-{ echo "$as_me:$LINENO: checking whether build environment is sane" >&5 +-echo $ECHO_N "checking whether build environment is sane... $ECHO_C" >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5 ++$as_echo_n "checking whether build environment is sane... " >&6; } + # Just in case + sleep 1 + echo timestamp > conftest.file ++# Reject unsafe characters in $srcdir or the absolute working directory ++# name. Accept space and tab only in the latter. ++am_lf=' ++' ++case `pwd` in ++ *[\\\"\#\$\&\'\`$am_lf]*) ++ as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5;; ++esac ++case $srcdir in ++ *[\\\"\#\$\&\'\`$am_lf\ \ ]*) ++ as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;; ++esac ++ + # Do `set' in a subshell so we don't clobber the current shell's + # arguments. Must try -L first in case configure is actually a + # symlink; some systems play weird games with the mod time of symlinks + # (eg FreeBSD returns the mod time of the symlink's containing + # directory). + if ( +- set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null` ++ set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` + if test "$*" = "X"; then + # -L didn't work. +- set X `ls -t $srcdir/configure conftest.file` ++ set X `ls -t "$srcdir/configure" conftest.file` + fi + rm -f conftest.file + if test "$*" != "X $srcdir/configure conftest.file" \ +@@ -1830,11 +2006,8 @@ + # if, for instance, CONFIG_SHELL is bash and it inherits a + # broken ls alias from the environment. This has actually + # happened. Such a system could not be considered "sane". +- { { echo "$as_me:$LINENO: error: ls -t appears to fail. Make sure there is not a broken +-alias in your environment" >&5 +-echo "$as_me: error: ls -t appears to fail. Make sure there is not a broken +-alias in your environment" >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error $? "ls -t appears to fail. Make sure there is not a broken ++alias in your environment" "$LINENO" 5 + fi + + test "$2" = conftest.file +@@ -1843,204 +2016,50 @@ + # Ok. + : + else +- { { echo "$as_me:$LINENO: error: newly created file is older than distributed files! +-Check your system clock" >&5 +-echo "$as_me: error: newly created file is older than distributed files! +-Check your system clock" >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error $? "newly created file is older than distributed files! ++Check your system clock" "$LINENO" 5 + fi +-{ echo "$as_me:$LINENO: result: yes" >&5 +-echo "${ECHO_T}yes" >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 ++$as_echo "yes" >&6; } + test "$program_prefix" != NONE && + program_transform_name="s&^&$program_prefix&;$program_transform_name" + # Use a double $ so make ignores it. + test "$program_suffix" != NONE && + program_transform_name="s&\$&$program_suffix&;$program_transform_name" +-# Double any \ or $. echo might interpret backslashes. ++# Double any \ or $. + # By default was `s,x,x', remove it if useless. +-cat <<\_ACEOF >conftest.sed +-s/[\\$]/&&/g;s/;s,x,x,$// +-_ACEOF +-program_transform_name=`echo $program_transform_name | sed -f conftest.sed` +-rm -f conftest.sed ++ac_script='s/[\\$]/&&/g;s/;s,x,x,$//' ++program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"` + + # expand $ac_aux_dir to an absolute path + am_aux_dir=`cd $ac_aux_dir && pwd` + +-test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing" ++if test x"${MISSING+set}" != xset; then ++ case $am_aux_dir in ++ *\ * | *\ *) ++ MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;; ++ *) ++ MISSING="\${SHELL} $am_aux_dir/missing" ;; ++ esac ++fi + # Use eval to expand $SHELL + if eval "$MISSING --run true"; then + am_missing_run="$MISSING --run " + else + am_missing_run= +- { echo "$as_me:$LINENO: WARNING: \`missing' script is too old or missing" >&5 +-echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;} +-fi +- +-if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then +- # We used to keeping the `.' as first argument, in order to +- # allow $(mkdir_p) to be used without argument. As in +- # $(mkdir_p) $(somedir) +- # where $(somedir) is conditionally defined. However this is wrong +- # for two reasons: +- # 1. if the package is installed by a user who cannot write `.' +- # make install will fail, +- # 2. the above comment should most certainly read +- # $(mkdir_p) $(DESTDIR)$(somedir) +- # so it does not work when $(somedir) is undefined and +- # $(DESTDIR) is not. +- # To support the latter case, we have to write +- # test -z "$(somedir)" || $(mkdir_p) $(DESTDIR)$(somedir), +- # so the `.' trick is pointless. +- mkdir_p='mkdir -p --' +-else +- # On NextStep and OpenStep, the `mkdir' command does not +- # recognize any option. It will interpret all options as +- # directories to create, and then abort because `.' already +- # exists. +- for d in ./-p ./--version; +- do +- test -d $d && rmdir $d +- done +- # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists. +- if test -f "$ac_aux_dir/mkinstalldirs"; then +- mkdir_p='$(mkinstalldirs)' +- else +- mkdir_p='$(install_sh) -d' +- fi +-fi +- +-for ac_prog in gawk mawk nawk awk +-do +- # Extract the first word of "$ac_prog", so it can be a program name with args. +-set dummy $ac_prog; ac_word=$2 +-{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +-if test "${ac_cv_prog_AWK+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- if test -n "$AWK"; then +- ac_cv_prog_AWK="$AWK" # Let the user override the test. +-else +-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +-for as_dir in $PATH +-do +- IFS=$as_save_IFS +- test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then +- ac_cv_prog_AWK="$ac_prog" +- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 +- break 2 +- fi +-done +-done +-IFS=$as_save_IFS +- +-fi +-fi +-AWK=$ac_cv_prog_AWK +-if test -n "$AWK"; then +- { echo "$as_me:$LINENO: result: $AWK" >&5 +-echo "${ECHO_T}$AWK" >&6; } +-else +- { echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`missing' script is too old or missing" >&5 ++$as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;} + fi + +- +- test -n "$AWK" && break +-done +- +-{ echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5 +-echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6; } +-set x ${MAKE-make}; ac_make=`echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` +-if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- cat >conftest.make <<\_ACEOF +-SHELL = /bin/sh +-all: +- @echo '@@@%%%=$(MAKE)=@@@%%%' +-_ACEOF +-# GNU make sometimes prints "make[1]: Entering...", which would confuse us. +-case `${MAKE-make} -f conftest.make 2>/dev/null` in +- *@@@%%%=?*=@@@%%%*) +- eval ac_cv_prog_make_${ac_make}_set=yes;; ++if test x"${install_sh}" != xset; then ++ case $am_aux_dir in ++ *\ * | *\ *) ++ install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;; + *) +- eval ac_cv_prog_make_${ac_make}_set=no;; +-esac +-rm -f conftest.make +-fi +-if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then +- { echo "$as_me:$LINENO: result: yes" >&5 +-echo "${ECHO_T}yes" >&6; } +- SET_MAKE= +-else +- { echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6; } +- SET_MAKE="MAKE=${MAKE-make}" +-fi +- +-rm -rf .tst 2>/dev/null +-mkdir .tst 2>/dev/null +-if test -d .tst; then +- am__leading_dot=. +-else +- am__leading_dot=_ +-fi +-rmdir .tst 2>/dev/null +- +-# test to see if srcdir already configured +-if test "`cd $srcdir && pwd`" != "`pwd`" && +- test -f $srcdir/config.status; then +- { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5 +-echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;} +- { (exit 1); exit 1; }; } +-fi +- +-# test whether we have cygpath +-if test -z "$CYGPATH_W"; then +- if (cygpath --version) >/dev/null 2>/dev/null; then +- CYGPATH_W='cygpath -w' +- else +- CYGPATH_W=echo +- fi ++ install_sh="\${SHELL} $am_aux_dir/install-sh" ++ esac + fi + +- +-# Define the identity of the package. +- PACKAGE='exmap-console' +- VERSION='0.4.1' +- +- +-cat >>confdefs.h <<_ACEOF +-#define PACKAGE "$PACKAGE" +-_ACEOF +- +- +-cat >>confdefs.h <<_ACEOF +-#define VERSION "$VERSION" +-_ACEOF +- +-# Some tools Automake needs. +- +-ACLOCAL=${ACLOCAL-"${am_missing_run}aclocal-${am__api_version}"} +- +- +-AUTOCONF=${AUTOCONF-"${am_missing_run}autoconf"} +- +- +-AUTOMAKE=${AUTOMAKE-"${am_missing_run}automake-${am__api_version}"} +- +- +-AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"} +- +- +-MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"} +- +-install_sh=${install_sh-"$am_aux_dir/install-sh"} +- + # Installed binaries are usually stripped using `strip' when the user + # run `make install-strip'. However `strip' might not be the right + # tool to use in cross-compilation environments, therefore Automake +@@ -2049,10 +2068,10 @@ + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. + set dummy ${ac_tool_prefix}strip; ac_word=$2 +-{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +-if test "${ac_cv_prog_STRIP+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if ${ac_cv_prog_STRIP+:} false; then : ++ $as_echo_n "(cached) " >&6 + else + if test -n "$STRIP"; then + ac_cv_prog_STRIP="$STRIP" # Let the user override the test. +@@ -2062,25 +2081,25 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_STRIP="${ac_tool_prefix}strip" +- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done + IFS=$as_save_IFS + + fi + fi + STRIP=$ac_cv_prog_STRIP + if test -n "$STRIP"; then +- { echo "$as_me:$LINENO: result: $STRIP" >&5 +-echo "${ECHO_T}$STRIP" >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5 ++$as_echo "$STRIP" >&6; } + else +- { echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } + fi + + +@@ -2089,10 +2108,10 @@ + ac_ct_STRIP=$STRIP + # Extract the first word of "strip", so it can be a program name with args. + set dummy strip; ac_word=$2 +-{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +-if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if ${ac_cv_prog_ac_ct_STRIP+:} false; then : ++ $as_echo_n "(cached) " >&6 + else + if test -n "$ac_ct_STRIP"; then + ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test. +@@ -2102,48 +2121,224 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_STRIP="strip" +- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done + IFS=$as_save_IFS + + fi + fi + ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP + if test -n "$ac_ct_STRIP"; then +- { echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5 +-echo "${ECHO_T}$ac_ct_STRIP" >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5 ++$as_echo "$ac_ct_STRIP" >&6; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++fi ++ ++ if test "x$ac_ct_STRIP" = x; then ++ STRIP=":" ++ else ++ case $cross_compiling:$ac_tool_warned in ++yes:) ++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 ++$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ++ac_tool_warned=yes ;; ++esac ++ STRIP=$ac_ct_STRIP ++ fi ++else ++ STRIP="$ac_cv_prog_STRIP" ++fi ++ ++fi ++INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" ++ ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a thread-safe mkdir -p" >&5 ++$as_echo_n "checking for a thread-safe mkdir -p... " >&6; } ++if test -z "$MKDIR_P"; then ++ if ${ac_cv_path_mkdir+:} false; then : ++ $as_echo_n "(cached) " >&6 ++else ++ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_prog in mkdir gmkdir; do ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue ++ case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #( ++ 'mkdir (GNU coreutils) '* | \ ++ 'mkdir (coreutils) '* | \ ++ 'mkdir (fileutils) '4.1*) ++ ac_cv_path_mkdir=$as_dir/$ac_prog$ac_exec_ext ++ break 3;; ++ esac ++ done ++ done ++ done ++IFS=$as_save_IFS ++ ++fi ++ ++ test -d ./--version && rmdir ./--version ++ if test "${ac_cv_path_mkdir+set}" = set; then ++ MKDIR_P="$ac_cv_path_mkdir -p" ++ else ++ # As a last resort, use the slow shell script. Don't cache a ++ # value for MKDIR_P within a source directory, because that will ++ # break other packages using the cache if that directory is ++ # removed, or if the value is a relative name. ++ MKDIR_P="$ac_install_sh -d" ++ fi ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5 ++$as_echo "$MKDIR_P" >&6; } ++ ++mkdir_p="$MKDIR_P" ++case $mkdir_p in ++ [\\/$]* | ?:[\\/]*) ;; ++ */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;; ++esac ++ ++for ac_prog in gawk mawk nawk awk ++do ++ # Extract the first word of "$ac_prog", so it can be a program name with args. ++set dummy $ac_prog; ac_word=$2 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if ${ac_cv_prog_AWK+:} false; then : ++ $as_echo_n "(cached) " >&6 ++else ++ if test -n "$AWK"; then ++ ac_cv_prog_AWK="$AWK" # Let the user override the test. ++else ++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ ac_cv_prog_AWK="$ac_prog" ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++ done ++IFS=$as_save_IFS ++ ++fi ++fi ++AWK=$ac_cv_prog_AWK ++if test -n "$AWK"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5 ++$as_echo "$AWK" >&6; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++fi ++ ++ ++ test -n "$AWK" && break ++done ++ ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5 ++$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; } ++set x ${MAKE-make} ++ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` ++if eval \${ac_cv_prog_make_${ac_make}_set+:} false; then : ++ $as_echo_n "(cached) " >&6 ++else ++ cat >conftest.make <<\_ACEOF ++SHELL = /bin/sh ++all: ++ @echo '@@@%%%=$(MAKE)=@@@%%%' ++_ACEOF ++# GNU make sometimes prints "make[1]: Entering ...", which would confuse us. ++case `${MAKE-make} -f conftest.make 2>/dev/null` in ++ *@@@%%%=?*=@@@%%%*) ++ eval ac_cv_prog_make_${ac_make}_set=yes;; ++ *) ++ eval ac_cv_prog_make_${ac_make}_set=no;; ++esac ++rm -f conftest.make ++fi ++if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 ++$as_echo "yes" >&6; } ++ SET_MAKE= ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++ SET_MAKE="MAKE=${MAKE-make}" ++fi ++ ++rm -rf .tst 2>/dev/null ++mkdir .tst 2>/dev/null ++if test -d .tst; then ++ am__leading_dot=. + else +- { echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6; } ++ am__leading_dot=_ + fi ++rmdir .tst 2>/dev/null + +- if test "x$ac_ct_STRIP" = x; then +- STRIP=":" +- else +- case $cross_compiling:$ac_tool_warned in +-yes:) +-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools +-whose name does not start with the host triplet. If you think this +-configuration is useful to you, please write to autoconf@gnu.org." >&5 +-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools +-whose name does not start with the host triplet. If you think this +-configuration is useful to you, please write to autoconf@gnu.org." >&2;} +-ac_tool_warned=yes ;; +-esac +- STRIP=$ac_ct_STRIP ++if test "`cd $srcdir && pwd`" != "`pwd`"; then ++ # Use -I$(srcdir) only when $(srcdir) != ., so that make's output ++ # is not polluted with repeated "-I." ++ am__isrc=' -I$(srcdir)' ++ # test to see if srcdir already configured ++ if test -f $srcdir/config.status; then ++ as_fn_error $? "source directory already configured; run \"make distclean\" there first" "$LINENO" 5 + fi +-else +- STRIP="$ac_cv_prog_STRIP" + fi + ++# test whether we have cygpath ++if test -z "$CYGPATH_W"; then ++ if (cygpath --version) >/dev/null 2>/dev/null; then ++ CYGPATH_W='cygpath -w' ++ else ++ CYGPATH_W=echo ++ fi + fi +-INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s" ++ ++ ++# Define the identity of the package. ++ PACKAGE='exmap-console' ++ VERSION='0.4.1' ++ ++ ++cat >>confdefs.h <<_ACEOF ++#define PACKAGE "$PACKAGE" ++_ACEOF ++ ++ ++cat >>confdefs.h <<_ACEOF ++#define VERSION "$VERSION" ++_ACEOF ++ ++# Some tools Automake needs. ++ ++ACLOCAL=${ACLOCAL-"${am_missing_run}aclocal-${am__api_version}"} ++ ++ ++AUTOCONF=${AUTOCONF-"${am_missing_run}autoconf"} ++ ++ ++AUTOMAKE=${AUTOMAKE-"${am_missing_run}automake-${am__api_version}"} ++ ++ ++AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"} ++ ++ ++MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"} + + # We need awk for the "check" target. The system "awk" is bad on + # some platforms. +@@ -2165,7 +2360,7 @@ + + + # Check whether --with-readline was given. +-if test "${with_readline+set}" = set; then ++if test "${with_readline+set}" = set; then : + withval=$with_readline; WITH_READLINE=$enableval + else + WITH_READLINE=yes +@@ -2182,44 +2377,44 @@ + am_make=${MAKE-make} + cat > confinc << 'END' + am__doit: +- @echo done ++ @echo this is the am__doit target + .PHONY: am__doit + END + # If we don't find an include directive, just comment out the code. +-{ echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5 +-echo $ECHO_N "checking for style of include used by $am_make... $ECHO_C" >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for style of include used by $am_make" >&5 ++$as_echo_n "checking for style of include used by $am_make... " >&6; } + am__include="#" + am__quote= + _am_result=none + # First try GNU make style include. + echo "include confinc" > confmf +-# We grep out `Entering directory' and `Leaving directory' +-# messages which can occur if `w' ends up in MAKEFLAGS. +-# In particular we don't look at `^make:' because GNU make might +-# be invoked under some other name (usually "gmake"), in which +-# case it prints its new name instead of `make'. +-if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then +- am__include=include +- am__quote= +- _am_result=GNU +-fi ++# Ignore all kinds of additional output from `make'. ++case `$am_make -s -f confmf 2> /dev/null` in #( ++*the\ am__doit\ target*) ++ am__include=include ++ am__quote= ++ _am_result=GNU ++ ;; ++esac + # Now try BSD make style include. + if test "$am__include" = "#"; then + echo '.include "confinc"' > confmf +- if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then +- am__include=.include +- am__quote="\"" +- _am_result=BSD +- fi ++ case `$am_make -s -f confmf 2> /dev/null` in #( ++ *the\ am__doit\ target*) ++ am__include=.include ++ am__quote="\"" ++ _am_result=BSD ++ ;; ++ esac + fi + + +-{ echo "$as_me:$LINENO: result: $_am_result" >&5 +-echo "${ECHO_T}$_am_result" >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $_am_result" >&5 ++$as_echo "$_am_result" >&6; } + rm -f confinc confmf + + # Check whether --enable-dependency-tracking was given. +-if test "${enable_dependency_tracking+set}" = set; then ++if test "${enable_dependency_tracking+set}" = set; then : + enableval=$enable_dependency_tracking; + fi + +@@ -2227,9 +2422,7 @@ + am_depcomp="$ac_aux_dir/depcomp" + AMDEPBACKSLASH='\' + fi +- +- +-if test "x$enable_dependency_tracking" != xno; then ++ if test "x$enable_dependency_tracking" != xno; then + AMDEP_TRUE= + AMDEP_FALSE='#' + else +@@ -2238,7 +2431,6 @@ + fi + + +- + ac_ext=c + ac_cpp='$CPP $CPPFLAGS' + ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +@@ -2247,10 +2439,10 @@ + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. + set dummy ${ac_tool_prefix}gcc; ac_word=$2 +-{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +-if test "${ac_cv_prog_CC+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if ${ac_cv_prog_CC+:} false; then : ++ $as_echo_n "(cached) " >&6 + else + if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. +@@ -2260,25 +2452,25 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_CC="${ac_tool_prefix}gcc" +- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done + IFS=$as_save_IFS + + fi + fi + CC=$ac_cv_prog_CC + if test -n "$CC"; then +- { echo "$as_me:$LINENO: result: $CC" >&5 +-echo "${ECHO_T}$CC" >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 ++$as_echo "$CC" >&6; } + else +- { echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } + fi + + +@@ -2287,10 +2479,10 @@ + ac_ct_CC=$CC + # Extract the first word of "gcc", so it can be a program name with args. + set dummy gcc; ac_word=$2 +-{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if ${ac_cv_prog_ac_ct_CC+:} false; then : ++ $as_echo_n "(cached) " >&6 + else + if test -n "$ac_ct_CC"; then + ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. +@@ -2300,25 +2492,25 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_CC="gcc" +- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done + IFS=$as_save_IFS + + fi + fi + ac_ct_CC=$ac_cv_prog_ac_ct_CC + if test -n "$ac_ct_CC"; then +- { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 +-echo "${ECHO_T}$ac_ct_CC" >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 ++$as_echo "$ac_ct_CC" >&6; } + else +- { echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } + fi + + if test "x$ac_ct_CC" = x; then +@@ -2326,12 +2518,8 @@ + else + case $cross_compiling:$ac_tool_warned in + yes:) +-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools +-whose name does not start with the host triplet. If you think this +-configuration is useful to you, please write to autoconf@gnu.org." >&5 +-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools +-whose name does not start with the host triplet. If you think this +-configuration is useful to you, please write to autoconf@gnu.org." >&2;} ++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 ++$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} + ac_tool_warned=yes ;; + esac + CC=$ac_ct_CC +@@ -2344,10 +2532,10 @@ + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. + set dummy ${ac_tool_prefix}cc; ac_word=$2 +-{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +-if test "${ac_cv_prog_CC+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if ${ac_cv_prog_CC+:} false; then : ++ $as_echo_n "(cached) " >&6 + else + if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. +@@ -2357,25 +2545,25 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_CC="${ac_tool_prefix}cc" +- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done + IFS=$as_save_IFS + + fi + fi + CC=$ac_cv_prog_CC + if test -n "$CC"; then +- { echo "$as_me:$LINENO: result: $CC" >&5 +-echo "${ECHO_T}$CC" >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 ++$as_echo "$CC" >&6; } + else +- { echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } + fi + + +@@ -2384,10 +2572,10 @@ + if test -z "$CC"; then + # Extract the first word of "cc", so it can be a program name with args. + set dummy cc; ac_word=$2 +-{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +-if test "${ac_cv_prog_CC+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if ${ac_cv_prog_CC+:} false; then : ++ $as_echo_n "(cached) " >&6 + else + if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. +@@ -2398,18 +2586,18 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then + ac_prog_rejected=yes + continue + fi + ac_cv_prog_CC="cc" +- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done + IFS=$as_save_IFS + + if test $ac_prog_rejected = yes; then +@@ -2428,11 +2616,11 @@ + fi + CC=$ac_cv_prog_CC + if test -n "$CC"; then +- { echo "$as_me:$LINENO: result: $CC" >&5 +-echo "${ECHO_T}$CC" >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 ++$as_echo "$CC" >&6; } + else +- { echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } + fi + + +@@ -2443,10 +2631,10 @@ + do + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. + set dummy $ac_tool_prefix$ac_prog; ac_word=$2 +-{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +-if test "${ac_cv_prog_CC+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if ${ac_cv_prog_CC+:} false; then : ++ $as_echo_n "(cached) " >&6 + else + if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. +@@ -2456,25 +2644,25 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_CC="$ac_tool_prefix$ac_prog" +- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done + IFS=$as_save_IFS + + fi + fi + CC=$ac_cv_prog_CC + if test -n "$CC"; then +- { echo "$as_me:$LINENO: result: $CC" >&5 +-echo "${ECHO_T}$CC" >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 ++$as_echo "$CC" >&6; } + else +- { echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } + fi + + +@@ -2487,10 +2675,10 @@ + do + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 +-{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if ${ac_cv_prog_ac_ct_CC+:} false; then : ++ $as_echo_n "(cached) " >&6 + else + if test -n "$ac_ct_CC"; then + ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. +@@ -2500,25 +2688,25 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_CC="$ac_prog" +- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done + IFS=$as_save_IFS + + fi + fi + ac_ct_CC=$ac_cv_prog_ac_ct_CC + if test -n "$ac_ct_CC"; then +- { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 +-echo "${ECHO_T}$ac_ct_CC" >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 ++$as_echo "$ac_ct_CC" >&6; } + else +- { echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } + fi + + +@@ -2530,12 +2718,8 @@ + else + case $cross_compiling:$ac_tool_warned in + yes:) +-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools +-whose name does not start with the host triplet. If you think this +-configuration is useful to you, please write to autoconf@gnu.org." >&5 +-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools +-whose name does not start with the host triplet. If you think this +-configuration is useful to you, please write to autoconf@gnu.org." >&2;} ++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 ++$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} + ac_tool_warned=yes ;; + esac + CC=$ac_ct_CC +@@ -2545,51 +2729,37 @@ + fi + + +-test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH +-See \`config.log' for more details." >&5 +-echo "$as_me: error: no acceptable C compiler found in \$PATH +-See \`config.log' for more details." >&2;} +- { (exit 1); exit 1; }; } ++test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 ++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} ++as_fn_error $? "no acceptable C compiler found in \$PATH ++See \`config.log' for more details" "$LINENO" 5; } + + # Provide some information about the compiler. +-echo "$as_me:$LINENO: checking for C compiler version" >&5 +-ac_compiler=`set X $ac_compile; echo $2` +-{ (ac_try="$ac_compiler --version >&5" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_compiler --version >&5") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } +-{ (ac_try="$ac_compiler -v >&5" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_compiler -v >&5") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } +-{ (ac_try="$ac_compiler -V >&5" ++$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 ++set X $ac_compile ++ac_compiler=$2 ++for ac_option in --version -v -V -qversion; do ++ { { ac_try="$ac_compiler $ac_option >&5" + case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_compiler -V >&5") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } ++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" ++$as_echo "$ac_try_echo"; } >&5 ++ (eval "$ac_compiler $ac_option >&5") 2>conftest.err ++ ac_status=$? ++ if test -s conftest.err; then ++ sed '10a\ ++... rest of stderr output deleted ... ++ 10q' conftest.err >conftest.er1 ++ cat conftest.er1 >&5 ++ fi ++ rm -f conftest.er1 conftest.err ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; } ++done + +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + int +@@ -2601,59 +2771,55 @@ + } + _ACEOF + ac_clean_files_save=$ac_clean_files +-ac_clean_files="$ac_clean_files a.out a.exe b.out" ++ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out" + # Try to create an executable without -o first, disregard a.out. + # It will help us diagnose broken compilers, and finding out an intuition + # of exeext. +-{ echo "$as_me:$LINENO: checking for C compiler default output file name" >&5 +-echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6; } +-ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` +-# +-# List of possible output files, starting from the most likely. +-# The algorithm is not robust to junk in `.', hence go to wildcards (a.*) +-# only as a last resort. b.out is created by i960 compilers. +-ac_files='a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out' +-# +-# The IRIX 6 linker writes into existing files which may not be +-# executable, retaining their permissions. Remove them first so a +-# subsequent execution test works. ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5 ++$as_echo_n "checking whether the C compiler works... " >&6; } ++ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` ++ ++# The possible output files: ++ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*" ++ + ac_rmfiles= + for ac_file in $ac_files + do + case $ac_file in +- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;; ++ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;; + * ) ac_rmfiles="$ac_rmfiles $ac_file";; + esac + done + rm -f $ac_rmfiles + +-if { (ac_try="$ac_link_default" ++if { { ac_try="$ac_link_default" + case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" ++$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_link_default") 2>&5 + ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; then ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then : + # Autoconf-2.13 could set the ac_cv_exeext variable to `no'. + # So ignore a value of `no', otherwise this would lead to `EXEEXT = no' + # in a Makefile. We should not override ac_cv_exeext if it was cached, + # so that the user can short-circuit this test for compilers unknown to + # Autoconf. +-for ac_file in $ac_files ++for ac_file in $ac_files '' + do + test -f "$ac_file" || continue + case $ac_file in +- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ++ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) + ;; + [ab].out ) + # We found the default executable, but exeext='' is most + # certainly right. + break;; + *.* ) +- if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no; ++ if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no; + then :; else + ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` + fi +@@ -2670,76 +2836,43 @@ + test "$ac_cv_exeext" = no && ac_cv_exeext= + + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-{ { echo "$as_me:$LINENO: error: C compiler cannot create executables +-See \`config.log' for more details." >&5 +-echo "$as_me: error: C compiler cannot create executables +-See \`config.log' for more details." >&2;} +- { (exit 77); exit 77; }; } ++ ac_file='' + fi ++if test -z "$ac_file"; then : ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++$as_echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 + ++{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 ++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} ++as_fn_error 77 "C compiler cannot create executables ++See \`config.log' for more details" "$LINENO" 5; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 ++$as_echo "yes" >&6; } ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5 ++$as_echo_n "checking for C compiler default output file name... " >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5 ++$as_echo "$ac_file" >&6; } + ac_exeext=$ac_cv_exeext +-{ echo "$as_me:$LINENO: result: $ac_file" >&5 +-echo "${ECHO_T}$ac_file" >&6; } +- +-# Check that the compiler produces executables we can run. If not, either +-# the compiler is broken, or we cross compile. +-{ echo "$as_me:$LINENO: checking whether the C compiler works" >&5 +-echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6; } +-# FIXME: These cross compiler hacks should be removed for Autoconf 3.0 +-# If not cross compiling, check that we can run a simple program. +-if test "$cross_compiling" != yes; then +- if { ac_try='./$ac_file' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then +- cross_compiling=no +- else +- if test "$cross_compiling" = maybe; then +- cross_compiling=yes +- else +- { { echo "$as_me:$LINENO: error: cannot run C compiled programs. +-If you meant to cross compile, use \`--host'. +-See \`config.log' for more details." >&5 +-echo "$as_me: error: cannot run C compiled programs. +-If you meant to cross compile, use \`--host'. +-See \`config.log' for more details." >&2;} +- { (exit 1); exit 1; }; } +- fi +- fi +-fi +-{ echo "$as_me:$LINENO: result: yes" >&5 +-echo "${ECHO_T}yes" >&6; } + +-rm -f a.out a.exe conftest$ac_cv_exeext b.out ++rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out + ac_clean_files=$ac_clean_files_save +-# Check that the compiler produces executables we can run. If not, either +-# the compiler is broken, or we cross compile. +-{ echo "$as_me:$LINENO: checking whether we are cross compiling" >&5 +-echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6; } +-{ echo "$as_me:$LINENO: result: $cross_compiling" >&5 +-echo "${ECHO_T}$cross_compiling" >&6; } +- +-{ echo "$as_me:$LINENO: checking for suffix of executables" >&5 +-echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6; } +-if { (ac_try="$ac_link" ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5 ++$as_echo_n "checking for suffix of executables... " >&6; } ++if { { ac_try="$ac_link" + case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" ++$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_link") 2>&5 + ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; then ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then : + # If both `conftest.exe' and `conftest' are `present' (well, observable) + # catch `conftest.exe'. For instance with Cygwin, `ls conftest' will + # work properly (i.e., refer to `conftest.exe'), while it won't with +@@ -2747,37 +2880,90 @@ + for ac_file in conftest.exe conftest conftest.*; do + test -f "$ac_file" || continue + case $ac_file in +- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;; ++ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;; + *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` + break;; + * ) break;; + esac + done + else +- { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link +-See \`config.log' for more details." >&5 +-echo "$as_me: error: cannot compute suffix of executables: cannot compile and link +-See \`config.log' for more details." >&2;} +- { (exit 1); exit 1; }; } +-fi +- +-rm -f conftest$ac_cv_exeext +-{ echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5 +-echo "${ECHO_T}$ac_cv_exeext" >&6; } ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 ++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} ++as_fn_error $? "cannot compute suffix of executables: cannot compile and link ++See \`config.log' for more details" "$LINENO" 5; } ++fi ++rm -f conftest conftest$ac_cv_exeext ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5 ++$as_echo "$ac_cv_exeext" >&6; } + + rm -f conftest.$ac_ext + EXEEXT=$ac_cv_exeext + ac_exeext=$EXEEXT +-{ echo "$as_me:$LINENO: checking for suffix of object files" >&5 +-echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6; } +-if test "${ac_cv_objext+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++#include <stdio.h> ++int ++main () ++{ ++FILE *f = fopen ("conftest.out", "w"); ++ return ferror (f) || fclose (f) != 0; ++ ++ ; ++ return 0; ++} + _ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ac_clean_files="$ac_clean_files conftest.out" ++# Check that the compiler produces executables we can run. If not, either ++# the compiler is broken, or we cross compile. ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5 ++$as_echo_n "checking whether we are cross compiling... " >&6; } ++if test "$cross_compiling" != yes; then ++ { { ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" ++$as_echo "$ac_try_echo"; } >&5 ++ (eval "$ac_link") 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; } ++ if { ac_try='./conftest$ac_cv_exeext' ++ { { case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" ++$as_echo "$ac_try_echo"; } >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; }; then ++ cross_compiling=no ++ else ++ if test "$cross_compiling" = maybe; then ++ cross_compiling=yes ++ else ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 ++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} ++as_fn_error $? "cannot run C compiled programs. ++If you meant to cross compile, use \`--host'. ++See \`config.log' for more details" "$LINENO" 5; } ++ fi ++ fi ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5 ++$as_echo "$cross_compiling" >&6; } ++ ++rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out ++ac_clean_files=$ac_clean_files_save ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5 ++$as_echo_n "checking for suffix of object files... " >&6; } ++if ${ac_cv_objext+:} false; then : ++ $as_echo_n "(cached) " >&6 ++else ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + int +@@ -2789,51 +2975,46 @@ + } + _ACEOF + rm -f conftest.o conftest.obj +-if { (ac_try="$ac_compile" ++if { { ac_try="$ac_compile" + case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" ++$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_compile") 2>&5 + ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; then ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then : + for ac_file in conftest.o conftest.obj conftest.*; do + test -f "$ac_file" || continue; + case $ac_file in +- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf ) ;; ++ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM ) ;; + *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'` + break;; + esac + done + else +- echo "$as_me: failed program was:" >&5 ++ $as_echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +-{ { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile +-See \`config.log' for more details." >&5 +-echo "$as_me: error: cannot compute suffix of object files: cannot compile +-See \`config.log' for more details." >&2;} +- { (exit 1); exit 1; }; } ++{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 ++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} ++as_fn_error $? "cannot compute suffix of object files: cannot compile ++See \`config.log' for more details" "$LINENO" 5; } + fi +- + rm -f conftest.$ac_cv_objext conftest.$ac_ext + fi +-{ echo "$as_me:$LINENO: result: $ac_cv_objext" >&5 +-echo "${ECHO_T}$ac_cv_objext" >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5 ++$as_echo "$ac_cv_objext" >&6; } + OBJEXT=$ac_cv_objext + ac_objext=$OBJEXT +-{ echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5 +-echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6; } +-if test "${ac_cv_c_compiler_gnu+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5 ++$as_echo_n "checking whether we are using the GNU C compiler... " >&6; } ++if ${ac_cv_c_compiler_gnu+:} false; then : ++ $as_echo_n "(cached) " >&6 + else +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + int +@@ -2847,71 +3028,34 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_compile") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++if ac_fn_c_try_compile "$LINENO"; then : + ac_compiler_gnu=yes + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_compiler_gnu=no ++ ac_compiler_gnu=no + fi +- + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + ac_cv_c_compiler_gnu=$ac_compiler_gnu + + fi +-{ echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5 +-echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6; } +-GCC=`test $ac_compiler_gnu = yes && echo yes` ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5 ++$as_echo "$ac_cv_c_compiler_gnu" >&6; } ++if test $ac_compiler_gnu = yes; then ++ GCC=yes ++else ++ GCC= ++fi + ac_test_CFLAGS=${CFLAGS+set} + ac_save_CFLAGS=$CFLAGS +-{ echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5 +-echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6; } +-if test "${ac_cv_prog_cc_g+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5 ++$as_echo_n "checking whether $CC accepts -g... " >&6; } ++if ${ac_cv_prog_cc_g+:} false; then : ++ $as_echo_n "(cached) " >&6 + else + ac_save_c_werror_flag=$ac_c_werror_flag + ac_c_werror_flag=yes + ac_cv_prog_cc_g=no + CFLAGS="-g" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + int +@@ -2922,51 +3066,11 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_compile") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_prog_cc_g=yes + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- CFLAGS="" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ CFLAGS="" ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + int +@@ -2977,52 +3081,12 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_compile") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then +- : +-else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 ++if ac_fn_c_try_compile "$LINENO"; then : + +- ac_c_werror_flag=$ac_save_c_werror_flag ++else ++ ac_c_werror_flag=$ac_save_c_werror_flag + CFLAGS="-g" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + int +@@ -3033,59 +3097,18 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_compile") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_prog_cc_g=yes +-else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- + fi +- + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + fi +- + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + fi +- + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + ac_c_werror_flag=$ac_save_c_werror_flag + fi +-{ echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5 +-echo "${ECHO_T}$ac_cv_prog_cc_g" >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5 ++$as_echo "$ac_cv_prog_cc_g" >&6; } + if test "$ac_test_CFLAGS" = set; then + CFLAGS=$ac_save_CFLAGS + elif test $ac_cv_prog_cc_g = yes; then +@@ -3101,18 +3124,14 @@ + CFLAGS= + fi + fi +-{ echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5 +-echo $ECHO_N "checking for $CC option to accept ISO C89... $ECHO_C" >&6; } +-if test "${ac_cv_prog_cc_c89+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5 ++$as_echo_n "checking for $CC option to accept ISO C89... " >&6; } ++if ${ac_cv_prog_cc_c89+:} false; then : ++ $as_echo_n "(cached) " >&6 + else + ac_cv_prog_cc_c89=no + ac_save_CC=$CC +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + #include <stdarg.h> + #include <stdio.h> +@@ -3169,48 +3188,9 @@ + -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" + do + CC="$ac_save_CC $ac_arg" +- rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_compile") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_prog_cc_c89=$ac_arg +-else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- + fi +- + rm -f core conftest.err conftest.$ac_objext + test "x$ac_cv_prog_cc_c89" != "xno" && break + done +@@ -3221,17 +3201,19 @@ + # AC_CACHE_VAL + case "x$ac_cv_prog_cc_c89" in + x) +- { echo "$as_me:$LINENO: result: none needed" >&5 +-echo "${ECHO_T}none needed" >&6; } ;; ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 ++$as_echo "none needed" >&6; } ;; + xno) +- { echo "$as_me:$LINENO: result: unsupported" >&5 +-echo "${ECHO_T}unsupported" >&6; } ;; ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 ++$as_echo "unsupported" >&6; } ;; + *) + CC="$CC $ac_cv_prog_cc_c89" +- { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5 +-echo "${ECHO_T}$ac_cv_prog_cc_c89" >&6; } ;; ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5 ++$as_echo "$ac_cv_prog_cc_c89" >&6; } ;; + esac ++if test "x$ac_cv_prog_cc_c89" != xno; then : + ++fi + + ac_ext=c + ac_cpp='$CPP $CPPFLAGS' +@@ -3241,10 +3223,10 @@ + + depcc="$CC" am_compiler_list= + +-{ echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 +-echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6; } +-if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 ++$as_echo_n "checking dependency style of $depcc... " >&6; } ++if ${am_cv_CC_dependencies_compiler_type+:} false; then : ++ $as_echo_n "(cached) " >&6 + else + if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then + # We make a subdir and do the tests there. Otherwise we can end up +@@ -3269,6 +3251,11 @@ + if test "$am_compiler_list" = ""; then + am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp` + fi ++ am__universal=false ++ case " $depcc " in #( ++ *\ -arch\ *\ -arch\ *) am__universal=true ;; ++ esac ++ + for depmode in $am_compiler_list; do + # Setup a source with many dependencies, because some compilers + # like to wrap large dependency lists on column 80 (with \), and +@@ -3286,7 +3273,17 @@ + done + echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf + ++ # We check with `-c' and `-o' for the sake of the "dashmstdout" ++ # mode. It turns out that the SunPro C++ compiler does not properly ++ # handle `-M -o', and we need to detect this. Also, some Intel ++ # versions had trouble with output in subdirs ++ am__obj=sub/conftest.${OBJEXT-o} ++ am__minus_obj="-o $am__obj" + case $depmode in ++ gcc) ++ # This depmode causes a compiler race in universal mode. ++ test "$am__universal" = false || continue ++ ;; + nosideeffect) + # after this tag, mechanisms are not by side-effect, so they'll + # only be used when explicitly requested +@@ -3296,18 +3293,23 @@ + break + fi + ;; ++ msvisualcpp | msvcmsys) ++ # This compiler won't grok `-c -o', but also, the minuso test has ++ # not run yet. These depmodes are late enough in the game, and ++ # so weak that their functioning should not be impacted. ++ am__obj=conftest.${OBJEXT-o} ++ am__minus_obj= ++ ;; + none) break ;; + esac +- # We check with `-c' and `-o' for the sake of the "dashmstdout" +- # mode. It turns out that the SunPro C++ compiler does not properly +- # handle `-M -o', and we need to detect this. + if depmode=$depmode \ +- source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \ ++ source=sub/conftest.c object=$am__obj \ + depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ +- $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ ++ $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \ + >/dev/null 2>conftest.err && ++ grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && + grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && +- grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && ++ grep $am__obj sub/conftest.Po > /dev/null 2>&1 && + ${MAKE-make} -s -f confmf > /dev/null 2>&1; then + # icc doesn't choke on unknown options, it will just issue warnings + # or remarks (even with -Werror). So we grep stderr for any message +@@ -3331,13 +3333,11 @@ + fi + + fi +-{ echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5 +-echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5 ++$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; } + CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type + +- +- +-if ++ if + test "x$enable_dependency_tracking" != xno \ + && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then + am__fastdepCC_TRUE= +@@ -3349,18 +3349,14 @@ + + + +-{ echo "$as_me:$LINENO: checking for readline in -lreadline" >&5 +-echo $ECHO_N "checking for readline in -lreadline... $ECHO_C" >&6; } +-if test "${ac_cv_lib_readline_readline+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for readline in -lreadline" >&5 ++$as_echo_n "checking for readline in -lreadline... " >&6; } ++if ${ac_cv_lib_readline_readline+:} false; then : ++ $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS + LIBS="-lreadline $LIBS" +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + /* Override any GCC internal prototype to avoid an error. +@@ -3378,72 +3374,31 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_link") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_readline_readline=yes + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_cv_lib_readline_readline=no ++ ac_cv_lib_readline_readline=no + fi +- + rm -f core conftest.err conftest.$ac_objext \ +- conftest$ac_exeext conftest.$ac_ext ++ conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-{ echo "$as_me:$LINENO: result: $ac_cv_lib_readline_readline" >&5 +-echo "${ECHO_T}$ac_cv_lib_readline_readline" >&6; } +-if test $ac_cv_lib_readline_readline = yes; then ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_readline_readline" >&5 ++$as_echo "$ac_cv_lib_readline_readline" >&6; } ++if test "x$ac_cv_lib_readline_readline" = xyes; then : + WORKING_READLINE=yes + else + WORKING_READLINE=no + fi + +-{ echo "$as_me:$LINENO: checking for add_history in -lhistory" >&5 +-echo $ECHO_N "checking for add_history in -lhistory... $ECHO_C" >&6; } +-if test "${ac_cv_lib_history_add_history+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for add_history in -lhistory" >&5 ++$as_echo_n "checking for add_history in -lhistory... " >&6; } ++if ${ac_cv_lib_history_add_history+:} false; then : ++ $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS + LIBS="-lhistory $LIBS" +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + /* Override any GCC internal prototype to avoid an error. +@@ -3461,55 +3416,18 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_link") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_history_add_history=yes + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_cv_lib_history_add_history=no ++ ac_cv_lib_history_add_history=no + fi +- + rm -f core conftest.err conftest.$ac_objext \ +- conftest$ac_exeext conftest.$ac_ext ++ conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-{ echo "$as_me:$LINENO: result: $ac_cv_lib_history_add_history" >&5 +-echo "${ECHO_T}$ac_cv_lib_history_add_history" >&6; } +-if test $ac_cv_lib_history_add_history = yes; then ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_history_add_history" >&5 ++$as_echo "$ac_cv_lib_history_add_history" >&6; } ++if test "x$ac_cv_lib_history_add_history" = xyes; then : + WORKING_READLINE=yes + else + WORKING_READLINE=no +@@ -3524,9 +3442,7 @@ + fi + fi + +- +- +-if test "x$WITH_READLINE" = "xyes"; then ++ if test "x$WITH_READLINE" = "xyes"; then + INTERACTIVE_TRUE= + INTERACTIVE_FALSE='#' + else +@@ -3544,7 +3460,7 @@ + + + # Check whether --enable-doc was given. +-if test "${enable_doc+set}" = set; then ++if test "${enable_doc+set}" = set; then : + enableval=$enable_doc; DO_DOCS=$enableval + else + DO_DOCS=$enableval +@@ -3553,16 +3469,14 @@ + + + # Check whether --with-help2man was given. +-if test "${with_help2man+set}" = set; then ++if test "${with_help2man+set}" = set; then : + withval=$with_help2man; WITH_H2MAN=$withval + else + WITH_H2MAN=yes + fi + + +- +- +-if test "x$DO_DOCS" != "xno"; then ++ if test "x$DO_DOCS" != "xno"; then + DODOCS_TRUE= + DODOCS_FALSE='#' + else +@@ -3571,14 +3485,6 @@ + fi + + +-# Check whether --enable-debug was given. +-if test "${enable_debug+set}" = set; then +- enableval=$enable_debug; CFLAGS="-g -O0" +-else +- CFLAGS="-g -O2" +-fi +- +- + CFLAGS="$CFLAGS -DEXMAP_VERSION=\\\"$EXMAP_VERSION\\\" -DEXMAP_PROTOCOL_VERSION=\\\"$EXMAP_PROTOCOL_VERSION\\\"" + + +@@ -3591,10 +3497,10 @@ + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. + set dummy ${ac_tool_prefix}gcc; ac_word=$2 +-{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +-if test "${ac_cv_prog_CC+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if ${ac_cv_prog_CC+:} false; then : ++ $as_echo_n "(cached) " >&6 + else + if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. +@@ -3604,25 +3510,25 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_CC="${ac_tool_prefix}gcc" +- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done + IFS=$as_save_IFS + + fi + fi + CC=$ac_cv_prog_CC + if test -n "$CC"; then +- { echo "$as_me:$LINENO: result: $CC" >&5 +-echo "${ECHO_T}$CC" >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 ++$as_echo "$CC" >&6; } + else +- { echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } + fi + + +@@ -3631,10 +3537,10 @@ + ac_ct_CC=$CC + # Extract the first word of "gcc", so it can be a program name with args. + set dummy gcc; ac_word=$2 +-{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if ${ac_cv_prog_ac_ct_CC+:} false; then : ++ $as_echo_n "(cached) " >&6 + else + if test -n "$ac_ct_CC"; then + ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. +@@ -3644,25 +3550,25 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_CC="gcc" +- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done + IFS=$as_save_IFS + + fi + fi + ac_ct_CC=$ac_cv_prog_ac_ct_CC + if test -n "$ac_ct_CC"; then +- { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 +-echo "${ECHO_T}$ac_ct_CC" >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 ++$as_echo "$ac_ct_CC" >&6; } + else +- { echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } + fi + + if test "x$ac_ct_CC" = x; then +@@ -3670,12 +3576,8 @@ + else + case $cross_compiling:$ac_tool_warned in + yes:) +-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools +-whose name does not start with the host triplet. If you think this +-configuration is useful to you, please write to autoconf@gnu.org." >&5 +-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools +-whose name does not start with the host triplet. If you think this +-configuration is useful to you, please write to autoconf@gnu.org." >&2;} ++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 ++$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} + ac_tool_warned=yes ;; + esac + CC=$ac_ct_CC +@@ -3688,10 +3590,10 @@ + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. + set dummy ${ac_tool_prefix}cc; ac_word=$2 +-{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +-if test "${ac_cv_prog_CC+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if ${ac_cv_prog_CC+:} false; then : ++ $as_echo_n "(cached) " >&6 + else + if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. +@@ -3701,25 +3603,25 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_CC="${ac_tool_prefix}cc" +- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done + IFS=$as_save_IFS + + fi + fi + CC=$ac_cv_prog_CC + if test -n "$CC"; then +- { echo "$as_me:$LINENO: result: $CC" >&5 +-echo "${ECHO_T}$CC" >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 ++$as_echo "$CC" >&6; } + else +- { echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } + fi + + +@@ -3728,10 +3630,10 @@ + if test -z "$CC"; then + # Extract the first word of "cc", so it can be a program name with args. + set dummy cc; ac_word=$2 +-{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +-if test "${ac_cv_prog_CC+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if ${ac_cv_prog_CC+:} false; then : ++ $as_echo_n "(cached) " >&6 + else + if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. +@@ -3742,18 +3644,18 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then + ac_prog_rejected=yes + continue + fi + ac_cv_prog_CC="cc" +- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done + IFS=$as_save_IFS + + if test $ac_prog_rejected = yes; then +@@ -3772,11 +3674,11 @@ + fi + CC=$ac_cv_prog_CC + if test -n "$CC"; then +- { echo "$as_me:$LINENO: result: $CC" >&5 +-echo "${ECHO_T}$CC" >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 ++$as_echo "$CC" >&6; } + else +- { echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } + fi + + +@@ -3787,10 +3689,10 @@ + do + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. + set dummy $ac_tool_prefix$ac_prog; ac_word=$2 +-{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +-if test "${ac_cv_prog_CC+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if ${ac_cv_prog_CC+:} false; then : ++ $as_echo_n "(cached) " >&6 + else + if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. +@@ -3800,25 +3702,25 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_CC="$ac_tool_prefix$ac_prog" +- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done + IFS=$as_save_IFS + + fi + fi + CC=$ac_cv_prog_CC + if test -n "$CC"; then +- { echo "$as_me:$LINENO: result: $CC" >&5 +-echo "${ECHO_T}$CC" >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 ++$as_echo "$CC" >&6; } + else +- { echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } + fi + + +@@ -3831,10 +3733,10 @@ + do + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 +-{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if ${ac_cv_prog_ac_ct_CC+:} false; then : ++ $as_echo_n "(cached) " >&6 + else + if test -n "$ac_ct_CC"; then + ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. +@@ -3844,25 +3746,25 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_CC="$ac_prog" +- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done + IFS=$as_save_IFS + + fi + fi + ac_ct_CC=$ac_cv_prog_ac_ct_CC + if test -n "$ac_ct_CC"; then +- { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 +-echo "${ECHO_T}$ac_ct_CC" >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 ++$as_echo "$ac_ct_CC" >&6; } + else +- { echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } + fi + + +@@ -3874,12 +3776,8 @@ + else + case $cross_compiling:$ac_tool_warned in + yes:) +-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools +-whose name does not start with the host triplet. If you think this +-configuration is useful to you, please write to autoconf@gnu.org." >&5 +-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools +-whose name does not start with the host triplet. If you think this +-configuration is useful to you, please write to autoconf@gnu.org." >&2;} ++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 ++$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} + ac_tool_warned=yes ;; + esac + CC=$ac_ct_CC +@@ -3889,56 +3787,42 @@ + fi + + +-test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH +-See \`config.log' for more details." >&5 +-echo "$as_me: error: no acceptable C compiler found in \$PATH +-See \`config.log' for more details." >&2;} +- { (exit 1); exit 1; }; } ++test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 ++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} ++as_fn_error $? "no acceptable C compiler found in \$PATH ++See \`config.log' for more details" "$LINENO" 5; } + + # Provide some information about the compiler. +-echo "$as_me:$LINENO: checking for C compiler version" >&5 +-ac_compiler=`set X $ac_compile; echo $2` +-{ (ac_try="$ac_compiler --version >&5" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_compiler --version >&5") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } +-{ (ac_try="$ac_compiler -v >&5" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_compiler -v >&5") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } +-{ (ac_try="$ac_compiler -V >&5" ++$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 ++set X $ac_compile ++ac_compiler=$2 ++for ac_option in --version -v -V -qversion; do ++ { { ac_try="$ac_compiler $ac_option >&5" + case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_compiler -V >&5") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } +- +-{ echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5 +-echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6; } +-if test "${ac_cv_c_compiler_gnu+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" ++$as_echo "$ac_try_echo"; } >&5 ++ (eval "$ac_compiler $ac_option >&5") 2>conftest.err ++ ac_status=$? ++ if test -s conftest.err; then ++ sed '10a\ ++... rest of stderr output deleted ... ++ 10q' conftest.err >conftest.er1 ++ cat conftest.er1 >&5 ++ fi ++ rm -f conftest.er1 conftest.err ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; } ++done ++ ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5 ++$as_echo_n "checking whether we are using the GNU C compiler... " >&6; } ++if ${ac_cv_c_compiler_gnu+:} false; then : ++ $as_echo_n "(cached) " >&6 + else +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + int +@@ -3952,71 +3836,34 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_compile") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++if ac_fn_c_try_compile "$LINENO"; then : + ac_compiler_gnu=yes + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_compiler_gnu=no ++ ac_compiler_gnu=no + fi +- + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + ac_cv_c_compiler_gnu=$ac_compiler_gnu + + fi +-{ echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5 +-echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6; } +-GCC=`test $ac_compiler_gnu = yes && echo yes` ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5 ++$as_echo "$ac_cv_c_compiler_gnu" >&6; } ++if test $ac_compiler_gnu = yes; then ++ GCC=yes ++else ++ GCC= ++fi + ac_test_CFLAGS=${CFLAGS+set} + ac_save_CFLAGS=$CFLAGS +-{ echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5 +-echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6; } +-if test "${ac_cv_prog_cc_g+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5 ++$as_echo_n "checking whether $CC accepts -g... " >&6; } ++if ${ac_cv_prog_cc_g+:} false; then : ++ $as_echo_n "(cached) " >&6 + else + ac_save_c_werror_flag=$ac_c_werror_flag + ac_c_werror_flag=yes + ac_cv_prog_cc_g=no + CFLAGS="-g" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + int +@@ -4027,51 +3874,11 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_compile") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_prog_cc_g=yes + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- CFLAGS="" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ CFLAGS="" ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + int +@@ -4082,52 +3889,12 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_compile") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then +- : +-else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 ++if ac_fn_c_try_compile "$LINENO"; then : + +- ac_c_werror_flag=$ac_save_c_werror_flag ++else ++ ac_c_werror_flag=$ac_save_c_werror_flag + CFLAGS="-g" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + int +@@ -4138,59 +3905,18 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_compile") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_prog_cc_g=yes +-else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- + fi +- + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + fi +- + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + fi +- + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + ac_c_werror_flag=$ac_save_c_werror_flag + fi +-{ echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5 +-echo "${ECHO_T}$ac_cv_prog_cc_g" >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5 ++$as_echo "$ac_cv_prog_cc_g" >&6; } + if test "$ac_test_CFLAGS" = set; then + CFLAGS=$ac_save_CFLAGS + elif test $ac_cv_prog_cc_g = yes; then +@@ -4206,18 +3932,14 @@ + CFLAGS= + fi + fi +-{ echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5 +-echo $ECHO_N "checking for $CC option to accept ISO C89... $ECHO_C" >&6; } +-if test "${ac_cv_prog_cc_c89+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5 ++$as_echo_n "checking for $CC option to accept ISO C89... " >&6; } ++if ${ac_cv_prog_cc_c89+:} false; then : ++ $as_echo_n "(cached) " >&6 + else + ac_cv_prog_cc_c89=no + ac_save_CC=$CC +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + #include <stdarg.h> + #include <stdio.h> +@@ -4274,48 +3996,9 @@ + -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" + do + CC="$ac_save_CC $ac_arg" +- rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_compile") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_prog_cc_c89=$ac_arg +-else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- + fi +- + rm -f core conftest.err conftest.$ac_objext + test "x$ac_cv_prog_cc_c89" != "xno" && break + done +@@ -4326,17 +4009,19 @@ + # AC_CACHE_VAL + case "x$ac_cv_prog_cc_c89" in + x) +- { echo "$as_me:$LINENO: result: none needed" >&5 +-echo "${ECHO_T}none needed" >&6; } ;; ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 ++$as_echo "none needed" >&6; } ;; + xno) +- { echo "$as_me:$LINENO: result: unsupported" >&5 +-echo "${ECHO_T}unsupported" >&6; } ;; ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 ++$as_echo "unsupported" >&6; } ;; + *) + CC="$CC $ac_cv_prog_cc_c89" +- { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5 +-echo "${ECHO_T}$ac_cv_prog_cc_c89" >&6; } ;; ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5 ++$as_echo "$ac_cv_prog_cc_c89" >&6; } ;; + esac ++if test "x$ac_cv_prog_cc_c89" != xno; then : + ++fi + + ac_ext=c + ac_cpp='$CPP $CPPFLAGS' +@@ -4346,10 +4031,10 @@ + + depcc="$CC" am_compiler_list= + +-{ echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 +-echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6; } +-if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 ++$as_echo_n "checking dependency style of $depcc... " >&6; } ++if ${am_cv_CC_dependencies_compiler_type+:} false; then : ++ $as_echo_n "(cached) " >&6 + else + if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then + # We make a subdir and do the tests there. Otherwise we can end up +@@ -4374,6 +4059,11 @@ + if test "$am_compiler_list" = ""; then + am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp` + fi ++ am__universal=false ++ case " $depcc " in #( ++ *\ -arch\ *\ -arch\ *) am__universal=true ;; ++ esac ++ + for depmode in $am_compiler_list; do + # Setup a source with many dependencies, because some compilers + # like to wrap large dependency lists on column 80 (with \), and +@@ -4391,7 +4081,17 @@ + done + echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf + ++ # We check with `-c' and `-o' for the sake of the "dashmstdout" ++ # mode. It turns out that the SunPro C++ compiler does not properly ++ # handle `-M -o', and we need to detect this. Also, some Intel ++ # versions had trouble with output in subdirs ++ am__obj=sub/conftest.${OBJEXT-o} ++ am__minus_obj="-o $am__obj" + case $depmode in ++ gcc) ++ # This depmode causes a compiler race in universal mode. ++ test "$am__universal" = false || continue ++ ;; + nosideeffect) + # after this tag, mechanisms are not by side-effect, so they'll + # only be used when explicitly requested +@@ -4401,18 +4101,23 @@ + break + fi + ;; ++ msvisualcpp | msvcmsys) ++ # This compiler won't grok `-c -o', but also, the minuso test has ++ # not run yet. These depmodes are late enough in the game, and ++ # so weak that their functioning should not be impacted. ++ am__obj=conftest.${OBJEXT-o} ++ am__minus_obj= ++ ;; + none) break ;; + esac +- # We check with `-c' and `-o' for the sake of the "dashmstdout" +- # mode. It turns out that the SunPro C++ compiler does not properly +- # handle `-M -o', and we need to detect this. + if depmode=$depmode \ +- source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \ ++ source=sub/conftest.c object=$am__obj \ + depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ +- $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ ++ $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \ + >/dev/null 2>conftest.err && ++ grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && + grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && +- grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && ++ grep $am__obj sub/conftest.Po > /dev/null 2>&1 && + ${MAKE-make} -s -f confmf > /dev/null 2>&1; then + # icc doesn't choke on unknown options, it will just issue warnings + # or remarks (even with -Werror). So we grep stderr for any message +@@ -4436,13 +4141,11 @@ + fi + + fi +-{ echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5 +-echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5 ++$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; } + CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type + +- +- +-if ++ if + test "x$enable_dependency_tracking" != xno \ + && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then + am__fastdepCC_TRUE= +@@ -4456,14 +4159,18 @@ + + + ++ ++ ++ ++ + if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. + set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 +-{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +-if test "${ac_cv_path_PKG_CONFIG+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if ${ac_cv_path_PKG_CONFIG+:} false; then : ++ $as_echo_n "(cached) " >&6 + else + case $PKG_CONFIG in + [\\/]* | ?:[\\/]*) +@@ -4475,14 +4182,14 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" +- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done + IFS=$as_save_IFS + + ;; +@@ -4490,11 +4197,11 @@ + fi + PKG_CONFIG=$ac_cv_path_PKG_CONFIG + if test -n "$PKG_CONFIG"; then +- { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 +-echo "${ECHO_T}$PKG_CONFIG" >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5 ++$as_echo "$PKG_CONFIG" >&6; } + else +- { echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } + fi + + +@@ -4503,10 +4210,10 @@ + ac_pt_PKG_CONFIG=$PKG_CONFIG + # Extract the first word of "pkg-config", so it can be a program name with args. + set dummy pkg-config; ac_word=$2 +-{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +-if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then : ++ $as_echo_n "(cached) " >&6 + else + case $ac_pt_PKG_CONFIG in + [\\/]* | ?:[\\/]*) +@@ -4518,14 +4225,14 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" +- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done + IFS=$as_save_IFS + + ;; +@@ -4533,11 +4240,11 @@ + fi + ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG + if test -n "$ac_pt_PKG_CONFIG"; then +- { echo "$as_me:$LINENO: result: $ac_pt_PKG_CONFIG" >&5 +-echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5 ++$as_echo "$ac_pt_PKG_CONFIG" >&6; } + else +- { echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } + fi + + if test "x$ac_pt_PKG_CONFIG" = x; then +@@ -4545,12 +4252,8 @@ + else + case $cross_compiling:$ac_tool_warned in + yes:) +-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools +-whose name does not start with the host triplet. If you think this +-configuration is useful to you, please write to autoconf@gnu.org." >&5 +-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools +-whose name does not start with the host triplet. If you think this +-configuration is useful to you, please write to autoconf@gnu.org." >&2;} ++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 ++$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} + ac_tool_warned=yes ;; + esac + PKG_CONFIG=$ac_pt_PKG_CONFIG +@@ -4562,63 +4265,60 @@ + fi + if test -n "$PKG_CONFIG"; then + _pkg_min_version=0.9.0 +- { echo "$as_me:$LINENO: checking pkg-config is at least version $_pkg_min_version" >&5 +-echo $ECHO_N "checking pkg-config is at least version $_pkg_min_version... $ECHO_C" >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5 ++$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; } + if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then +- { echo "$as_me:$LINENO: result: yes" >&5 +-echo "${ECHO_T}yes" >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 ++$as_echo "yes" >&6; } + else +- { echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } + PKG_CONFIG="" + fi +- + fi + + pkg_failed=no +-{ echo "$as_me:$LINENO: checking for GLIB" >&5 +-echo $ECHO_N "checking for GLIB... $ECHO_C" >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GLIB" >&5 ++$as_echo_n "checking for GLIB... " >&6; } + +-if test -n "$PKG_CONFIG"; then +- if test -n "$GLIB_CFLAGS"; then +- pkg_cv_GLIB_CFLAGS="$GLIB_CFLAGS" +- else +- if test -n "$PKG_CONFIG" && \ +- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0\"") >&5 ++if test -n "$GLIB_CFLAGS"; then ++ pkg_cv_GLIB_CFLAGS="$GLIB_CFLAGS" ++ elif test -n "$PKG_CONFIG"; then ++ if test -n "$PKG_CONFIG" && \ ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0\""; } >&5 + ($PKG_CONFIG --exists --print-errors "glib-2.0") 2>&5 + ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; then ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then + pkg_cv_GLIB_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0" 2>/dev/null` + else + pkg_failed=yes + fi +- fi +-else +- pkg_failed=untried ++ else ++ pkg_failed=untried + fi +-if test -n "$PKG_CONFIG"; then +- if test -n "$GLIB_LIBS"; then +- pkg_cv_GLIB_LIBS="$GLIB_LIBS" +- else +- if test -n "$PKG_CONFIG" && \ +- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0\"") >&5 ++if test -n "$GLIB_LIBS"; then ++ pkg_cv_GLIB_LIBS="$GLIB_LIBS" ++ elif test -n "$PKG_CONFIG"; then ++ if test -n "$PKG_CONFIG" && \ ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0\""; } >&5 + ($PKG_CONFIG --exists --print-errors "glib-2.0") 2>&5 + ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; then ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then + pkg_cv_GLIB_LIBS=`$PKG_CONFIG --libs "glib-2.0" 2>/dev/null` + else + pkg_failed=yes + fi +- fi +-else +- pkg_failed=untried ++ else ++ pkg_failed=untried + fi + + + + if test $pkg_failed = yes; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } + + if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes +@@ -4626,25 +4326,14 @@ + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- GLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "glib-2.0"` ++ GLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "glib-2.0" 2>&1` + else +- GLIB_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "glib-2.0"` ++ GLIB_PKG_ERRORS=`$PKG_CONFIG --print-errors "glib-2.0" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$GLIB_PKG_ERRORS" >&5 + +- { { echo "$as_me:$LINENO: error: Package requirements (glib-2.0) were not met: +- +-$GLIB_PKG_ERRORS +- +-Consider adjusting the PKG_CONFIG_PATH environment variable if you +-installed software in a non-standard prefix. +- +-Alternatively, you may set the environment variables GLIB_CFLAGS +-and GLIB_LIBS to avoid the need to call pkg-config. +-See the pkg-config man page for more details. +-" >&5 +-echo "$as_me: error: Package requirements (glib-2.0) were not met: ++ as_fn_error $? "Package requirements (glib-2.0) were not met: + + $GLIB_PKG_ERRORS + +@@ -4653,21 +4342,13 @@ + + Alternatively, you may set the environment variables GLIB_CFLAGS + and GLIB_LIBS to avoid the need to call pkg-config. +-See the pkg-config man page for more details. +-" >&2;} +- { (exit 1); exit 1; }; } ++See the pkg-config man page for more details." "$LINENO" 5 + elif test $pkg_failed = untried; then +- { { echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it +-is in your PATH or set the PKG_CONFIG environment variable to the full +-path to pkg-config. +- +-Alternatively, you may set the environment variables GLIB_CFLAGS +-and GLIB_LIBS to avoid the need to call pkg-config. +-See the pkg-config man page for more details. +- +-To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>. +-See \`config.log' for more details." >&5 +-echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 ++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} ++as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it + is in your PATH or set the PKG_CONFIG environment variable to the full + path to pkg-config. + +@@ -4675,15 +4356,14 @@ + and GLIB_LIBS to avoid the need to call pkg-config. + See the pkg-config man page for more details. + +-To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>. +-See \`config.log' for more details." >&2;} +- { (exit 1); exit 1; }; } ++To get pkg-config, see <http://pkg-config.freedesktop.org/>. ++See \`config.log' for more details" "$LINENO" 5; } + else + GLIB_CFLAGS=$pkg_cv_GLIB_CFLAGS + GLIB_LIBS=$pkg_cv_GLIB_LIBS +- { echo "$as_me:$LINENO: result: yes" >&5 +-echo "${ECHO_T}yes" >&6; } +- : ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 ++$as_echo "yes" >&6; } ++ + fi + + +@@ -4695,10 +4375,10 @@ + #autodetect, error if not found + # Extract the first word of "help2man", so it can be a program name with args. + set dummy help2man; ac_word=$2 +-{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +-if test "${ac_cv_path_HELPTOMAN+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if ${ac_cv_path_HELPTOMAN+:} false; then : ++ $as_echo_n "(cached) " >&6 + else + case $HELPTOMAN in + [\\/]* | ?:[\\/]*) +@@ -4710,14 +4390,14 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_HELPTOMAN="$as_dir/$ac_word$ac_exec_ext" +- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done + IFS=$as_save_IFS + + test -z "$ac_cv_path_HELPTOMAN" && ac_cv_path_HELPTOMAN="no" +@@ -4726,18 +4406,16 @@ + fi + HELPTOMAN=$ac_cv_path_HELPTOMAN + if test -n "$HELPTOMAN"; then +- { echo "$as_me:$LINENO: result: $HELPTOMAN" >&5 +-echo "${ECHO_T}$HELPTOMAN" >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $HELPTOMAN" >&5 ++$as_echo "$HELPTOMAN" >&6; } + else +- { echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } + fi + + + if test "x$HELPTOMAN" = "xno" ; then +- { { echo "$as_me:$LINENO: error: help2man not found -- either install it or use --without-help2man or --disable-doc" >&5 +-echo "$as_me: error: help2man not found -- either install it or use --without-help2man or --disable-doc" >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error $? "help2man not found -- either install it or use --without-help2man or --disable-doc" "$LINENO" 5 + fi + else + if test x$WITH_H2MAN = xno ; then +@@ -4749,10 +4427,10 @@ + if test x$H2M_PATH = x$WITH_H2MAN ; then + # Extract the first word of "$H2M_PROG", so it can be a program name with args. + set dummy $H2M_PROG; ac_word=$2 +-{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +-if test "${ac_cv_path_HELPTOMAN+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if ${ac_cv_path_HELPTOMAN+:} false; then : ++ $as_echo_n "(cached) " >&6 + else + case $HELPTOMAN in + [\\/]* | ?:[\\/]*) +@@ -4764,14 +4442,14 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_HELPTOMAN="$as_dir/$ac_word$ac_exec_ext" +- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done + IFS=$as_save_IFS + + test -z "$ac_cv_path_HELPTOMAN" && ac_cv_path_HELPTOMAN="no" +@@ -4780,21 +4458,21 @@ + fi + HELPTOMAN=$ac_cv_path_HELPTOMAN + if test -n "$HELPTOMAN"; then +- { echo "$as_me:$LINENO: result: $HELPTOMAN" >&5 +-echo "${ECHO_T}$HELPTOMAN" >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $HELPTOMAN" >&5 ++$as_echo "$HELPTOMAN" >&6; } + else +- { echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } + fi + + + else + # Extract the first word of "$H2M_PROG", so it can be a program name with args. + set dummy $H2M_PROG; ac_word=$2 +-{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +-if test "${ac_cv_path_HELPTOMAN+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if ${ac_cv_path_HELPTOMAN+:} false; then : ++ $as_echo_n "(cached) " >&6 + else + case $HELPTOMAN in + [\\/]* | ?:[\\/]*) +@@ -4806,14 +4484,14 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_HELPTOMAN="$as_dir/$ac_word$ac_exec_ext" +- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done + IFS=$as_save_IFS + + test -z "$ac_cv_path_HELPTOMAN" && ac_cv_path_HELPTOMAN="no" +@@ -4822,28 +4500,24 @@ + fi + HELPTOMAN=$ac_cv_path_HELPTOMAN + if test -n "$HELPTOMAN"; then +- { echo "$as_me:$LINENO: result: $HELPTOMAN" >&5 +-echo "${ECHO_T}$HELPTOMAN" >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $HELPTOMAN" >&5 ++$as_echo "$HELPTOMAN" >&6; } + else +- { echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } + fi + + + fi + + if test "x$HELPTOMAN" = "xno" ; then +- { { echo "$as_me:$LINENO: error: $WITH_H2MAN not found" >&5 +-echo "$as_me: error: $WITH_H2MAN not found" >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error $? "$WITH_H2MAN not found" "$LINENO" 5 + fi + fi + fi + fi + +- +- +-if test "x$HELPTOMAN" != "xno"; then ++ if test "x$HELPTOMAN" != "xno"; then + HAVE_HELPTOMAN_TRUE= + HAVE_HELPTOMAN_FALSE='#' + else +@@ -4889,12 +4563,13 @@ + case $ac_val in #( + *${as_nl}*) + case $ac_var in #( +- *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5 +-echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;; ++ *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 ++$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; + esac + case $ac_var in #( + _ | IFS | as_nl) ;; #( +- *) $as_unset $ac_var ;; ++ BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #( ++ *) { eval $ac_var=; unset $ac_var;} ;; + esac ;; + esac + done +@@ -4902,8 +4577,8 @@ + (set) 2>&1 | + case $as_nl`(ac_space=' '; set) 2>&1` in #( + *${as_nl}ac_space=\ *) +- # `set' does not quote correctly, so add quotes (double-quote +- # substitution turns \\\\ into \\, and sed turns \\ into \). ++ # `set' does not quote correctly, so add quotes: double-quote ++ # substitution turns \\\\ into \\, and sed turns \\ into \. + sed -n \ + "s/'/'\\\\''/g; + s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p" +@@ -4925,13 +4600,24 @@ + :end' >>confcache + if diff "$cache_file" confcache >/dev/null 2>&1; then :; else + if test -w "$cache_file"; then +- test "x$cache_file" != "x/dev/null" && +- { echo "$as_me:$LINENO: updating cache $cache_file" >&5 +-echo "$as_me: updating cache $cache_file" >&6;} +- cat confcache >$cache_file ++ if test "x$cache_file" != "x/dev/null"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5 ++$as_echo "$as_me: updating cache $cache_file" >&6;} ++ if test ! -f "$cache_file" || test -h "$cache_file"; then ++ cat confcache >"$cache_file" ++ else ++ case $cache_file in #( ++ */* | ?:*) ++ mv -f confcache "$cache_file"$$ && ++ mv -f "$cache_file"$$ "$cache_file" ;; #( ++ *) ++ mv -f confcache "$cache_file" ;; ++ esac ++ fi ++ fi + else +- { echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5 +-echo "$as_me: not updating unwritable cache $cache_file" >&6;} ++ { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5 ++$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;} + fi + fi + rm -f confcache +@@ -4948,6 +4634,12 @@ + # take arguments), then branch to the quote section. Otherwise, + # look for a macro that doesn't take arguments. + ac_script=' ++:mline ++/\\$/{ ++ N ++ s,\\\n,, ++ b mline ++} + t clear + :clear + s/^[ ]*#[ ]*define[ ][ ]*\([^ (][^ (]*([^)]*)\)[ ]*\(.*\)/-D\1=\2/g +@@ -4974,69 +4666,62 @@ + + ac_libobjs= + ac_ltlibobjs= ++U= + for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue + # 1. Remove the extension, and $U if already installed. + ac_script='s/\$U\././;s/\.o$//;s/\.obj$//' +- ac_i=`echo "$ac_i" | sed "$ac_script"` ++ ac_i=`$as_echo "$ac_i" | sed "$ac_script"` + # 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR + # will be set to the directory where LIBOBJS objects are built. +- ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext" +- ac_ltlibobjs="$ac_ltlibobjs \${LIBOBJDIR}$ac_i"'$U.lo' ++ as_fn_append ac_libobjs " \${LIBOBJDIR}$ac_i\$U.$ac_objext" ++ as_fn_append ac_ltlibobjs " \${LIBOBJDIR}$ac_i"'$U.lo' + done + LIBOBJS=$ac_libobjs + + LTLIBOBJS=$ac_ltlibobjs + + ++ if test -n "$EXEEXT"; then ++ am__EXEEXT_TRUE= ++ am__EXEEXT_FALSE='#' ++else ++ am__EXEEXT_TRUE='#' ++ am__EXEEXT_FALSE= ++fi ++ + if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then +- { { echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined. +-Usually this means the macro was only invoked conditionally." >&5 +-echo "$as_me: error: conditional \"AMDEP\" was never defined. +-Usually this means the macro was only invoked conditionally." >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error $? "conditional \"AMDEP\" was never defined. ++Usually this means the macro was only invoked conditionally." "$LINENO" 5 + fi + if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then +- { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined. +-Usually this means the macro was only invoked conditionally." >&5 +-echo "$as_me: error: conditional \"am__fastdepCC\" was never defined. +-Usually this means the macro was only invoked conditionally." >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error $? "conditional \"am__fastdepCC\" was never defined. ++Usually this means the macro was only invoked conditionally." "$LINENO" 5 + fi + if test -z "${INTERACTIVE_TRUE}" && test -z "${INTERACTIVE_FALSE}"; then +- { { echo "$as_me:$LINENO: error: conditional \"INTERACTIVE\" was never defined. +-Usually this means the macro was only invoked conditionally." >&5 +-echo "$as_me: error: conditional \"INTERACTIVE\" was never defined. +-Usually this means the macro was only invoked conditionally." >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error $? "conditional \"INTERACTIVE\" was never defined. ++Usually this means the macro was only invoked conditionally." "$LINENO" 5 + fi + if test -z "${DODOCS_TRUE}" && test -z "${DODOCS_FALSE}"; then +- { { echo "$as_me:$LINENO: error: conditional \"DODOCS\" was never defined. +-Usually this means the macro was only invoked conditionally." >&5 +-echo "$as_me: error: conditional \"DODOCS\" was never defined. +-Usually this means the macro was only invoked conditionally." >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error $? "conditional \"DODOCS\" was never defined. ++Usually this means the macro was only invoked conditionally." "$LINENO" 5 + fi + if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then +- { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined. +-Usually this means the macro was only invoked conditionally." >&5 +-echo "$as_me: error: conditional \"am__fastdepCC\" was never defined. +-Usually this means the macro was only invoked conditionally." >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error $? "conditional \"am__fastdepCC\" was never defined. ++Usually this means the macro was only invoked conditionally." "$LINENO" 5 + fi + if test -z "${HAVE_HELPTOMAN_TRUE}" && test -z "${HAVE_HELPTOMAN_FALSE}"; then +- { { echo "$as_me:$LINENO: error: conditional \"HAVE_HELPTOMAN\" was never defined. +-Usually this means the macro was only invoked conditionally." >&5 +-echo "$as_me: error: conditional \"HAVE_HELPTOMAN\" was never defined. +-Usually this means the macro was only invoked conditionally." >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error $? "conditional \"HAVE_HELPTOMAN\" was never defined. ++Usually this means the macro was only invoked conditionally." "$LINENO" 5 + fi + +-: ${CONFIG_STATUS=./config.status} ++: "${CONFIG_STATUS=./config.status}" ++ac_write_fail=0 + ac_clean_files_save=$ac_clean_files + ac_clean_files="$ac_clean_files $CONFIG_STATUS" +-{ echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5 +-echo "$as_me: creating $CONFIG_STATUS" >&6;} +-cat >$CONFIG_STATUS <<_ACEOF ++{ $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5 ++$as_echo "$as_me: creating $CONFIG_STATUS" >&6;} ++as_write_fail=0 ++cat >$CONFIG_STATUS <<_ASEOF || as_write_fail=1 + #! $SHELL + # Generated by $as_me. + # Run this file to recreate the current configuration. +@@ -5046,55 +4731,79 @@ + debug=false + ac_cs_recheck=false + ac_cs_silent=false +-SHELL=\${CONFIG_SHELL-$SHELL} +-_ACEOF + +-cat >>$CONFIG_STATUS <<\_ACEOF +-## --------------------- ## +-## M4sh Initialization. ## +-## --------------------- ## ++SHELL=\${CONFIG_SHELL-$SHELL} ++export SHELL ++_ASEOF ++cat >>$CONFIG_STATUS <<\_ASEOF || as_write_fail=1 ++## -------------------- ## ++## M4sh Initialization. ## ++## -------------------- ## + +-# Be Bourne compatible +-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then ++# Be more Bourne compatible ++DUALCASE=1; export DUALCASE # for MKS sh ++if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then : + emulate sh + NULLCMD=: +- # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which ++ # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which + # is contrary to our usage. Disable this feature. + alias -g '${1+"$@"}'='"$@"' + setopt NO_GLOB_SUBST + else +- case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac ++ case `(set -o) 2>/dev/null` in #( ++ *posix*) : ++ set -o posix ;; #( ++ *) : ++ ;; ++esac + fi +-BIN_SH=xpg4; export BIN_SH # for Tru64 +-DUALCASE=1; export DUALCASE # for MKS sh +- + +-# PATH needs CR +-# Avoid depending upon Character Ranges. +-as_cr_letters='abcdefghijklmnopqrstuvwxyz' +-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' +-as_cr_Letters=$as_cr_letters$as_cr_LETTERS +-as_cr_digits='0123456789' +-as_cr_alnum=$as_cr_Letters$as_cr_digits + +-# The user is always right. +-if test "${PATH_SEPARATOR+set}" != set; then +- echo "#! /bin/sh" >conf$$.sh +- echo "exit 0" >>conf$$.sh +- chmod +x conf$$.sh +- if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then +- PATH_SEPARATOR=';' ++as_nl=' ++' ++export as_nl ++# Printing a long string crashes Solaris 7 /usr/bin/printf. ++as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' ++as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo ++as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo ++# Prefer a ksh shell builtin over an external printf program on Solaris, ++# but without wasting forks for bash or zsh. ++if test -z "$BASH_VERSION$ZSH_VERSION" \ ++ && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then ++ as_echo='print -r --' ++ as_echo_n='print -rn --' ++elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then ++ as_echo='printf %s\n' ++ as_echo_n='printf %s' ++else ++ if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then ++ as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"' ++ as_echo_n='/usr/ucb/echo -n' + else +- PATH_SEPARATOR=: ++ as_echo_body='eval expr "X$1" : "X\\(.*\\)"' ++ as_echo_n_body='eval ++ arg=$1; ++ case $arg in #( ++ *"$as_nl"*) ++ expr "X$arg" : "X\\(.*\\)$as_nl"; ++ arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;; ++ esac; ++ expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl" ++ ' ++ export as_echo_n_body ++ as_echo_n='sh -c $as_echo_n_body as_echo' + fi +- rm -f conf$$.sh ++ export as_echo_body ++ as_echo='sh -c $as_echo_body as_echo' + fi + +-# Support unset when possible. +-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then +- as_unset=unset +-else +- as_unset=false ++# The user is always right. ++if test "${PATH_SEPARATOR+set}" != set; then ++ PATH_SEPARATOR=: ++ (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && { ++ (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 || ++ PATH_SEPARATOR=';' ++ } + fi + + +@@ -5103,20 +4812,19 @@ + # there to prevent editors from complaining about space-tab. + # (If _AS_PATH_WALK were called with IFS unset, it would disable word + # splitting by setting IFS to empty value.) +-as_nl=' +-' + IFS=" "" $as_nl" + + # Find who we are. Look in the path if we contain no directory separator. +-case $0 in ++as_myself= ++case $0 in #(( + *[\\/]* ) as_myself=$0 ;; + *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + for as_dir in $PATH + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break +-done ++ test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break ++ done + IFS=$as_save_IFS + + ;; +@@ -5127,32 +4835,111 @@ + as_myself=$0 + fi + if test ! -f "$as_myself"; then +- echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 +- { (exit 1); exit 1; } ++ $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 ++ exit 1 + fi + +-# Work around bugs in pre-3.0 UWIN ksh. +-for as_var in ENV MAIL MAILPATH +-do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var ++# Unset variables that we do not need and which cause bugs (e.g. in ++# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1" ++# suppresses any "Segmentation fault" message there. '((' could ++# trigger a bug in pdksh 5.2.14. ++for as_var in BASH_ENV ENV MAIL MAILPATH ++do eval test x\${$as_var+set} = xset \ ++ && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || : + done + PS1='$ ' + PS2='> ' + PS4='+ ' + + # NLS nuisances. +-for as_var in \ +- LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \ +- LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \ +- LC_TELEPHONE LC_TIME +-do +- if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then +- eval $as_var=C; export $as_var +- else +- ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var +- fi +-done ++LC_ALL=C ++export LC_ALL ++LANGUAGE=C ++export LANGUAGE ++ ++# CDPATH. ++(unset CDPATH) >/dev/null 2>&1 && unset CDPATH ++ ++ ++# as_fn_error STATUS ERROR [LINENO LOG_FD] ++# ---------------------------------------- ++# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are ++# provided, also output the error to LOG_FD, referencing LINENO. Then exit the ++# script with STATUS, using 1 if that was 0. ++as_fn_error () ++{ ++ as_status=$1; test $as_status -eq 0 && as_status=1 ++ if test "$4"; then ++ as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack ++ $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 ++ fi ++ $as_echo "$as_me: error: $2" >&2 ++ as_fn_exit $as_status ++} # as_fn_error ++ ++ ++# as_fn_set_status STATUS ++# ----------------------- ++# Set $? to STATUS, without forking. ++as_fn_set_status () ++{ ++ return $1 ++} # as_fn_set_status ++ ++# as_fn_exit STATUS ++# ----------------- ++# Exit the shell with STATUS, even in a "trap 0" or "set -e" context. ++as_fn_exit () ++{ ++ set +e ++ as_fn_set_status $1 ++ exit $1 ++} # as_fn_exit ++ ++# as_fn_unset VAR ++# --------------- ++# Portably unset VAR. ++as_fn_unset () ++{ ++ { eval $1=; unset $1;} ++} ++as_unset=as_fn_unset ++# as_fn_append VAR VALUE ++# ---------------------- ++# Append the text in VALUE to the end of the definition contained in VAR. Take ++# advantage of any shell optimizations that allow amortized linear growth over ++# repeated appends, instead of the typical quadratic growth present in naive ++# implementations. ++if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then : ++ eval 'as_fn_append () ++ { ++ eval $1+=\$2 ++ }' ++else ++ as_fn_append () ++ { ++ eval $1=\$$1\$2 ++ } ++fi # as_fn_append ++ ++# as_fn_arith ARG... ++# ------------------ ++# Perform arithmetic evaluation on the ARGs, and store the result in the ++# global $as_val. Take advantage of shells that can avoid forks. The arguments ++# must be portable across $(()) and expr. ++if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then : ++ eval 'as_fn_arith () ++ { ++ as_val=$(( $* )) ++ }' ++else ++ as_fn_arith () ++ { ++ as_val=`expr "$@" || test $? -eq 1` ++ } ++fi # as_fn_arith ++ + +-# Required to use basename. + if expr a : '\(a\)' >/dev/null 2>&1 && + test "X`expr 00001 : '.*\(...\)'`" = X001; then + as_expr=expr +@@ -5166,13 +4953,17 @@ + as_basename=false + fi + ++if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then ++ as_dirname=dirname ++else ++ as_dirname=false ++fi + +-# Name of the executable. + as_me=`$as_basename -- "$0" || + $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ + X"$0" : 'X\(//\)$' \| \ + X"$0" : 'X\(/\)' \| . 2>/dev/null || +-echo X/"$0" | ++$as_echo X/"$0" | + sed '/^.*\/\([^/][^/]*\)\/*$/{ + s//\1/ + q +@@ -5187,122 +4978,130 @@ + } + s/.*/./; q'` + +-# CDPATH. +-$as_unset CDPATH +- +- +- +- as_lineno_1=$LINENO +- as_lineno_2=$LINENO +- test "x$as_lineno_1" != "x$as_lineno_2" && +- test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || { +- +- # Create $as_me.lineno as a copy of $as_myself, but with $LINENO +- # uniformly replaced by the line number. The first 'sed' inserts a +- # line-number line after each line using $LINENO; the second 'sed' +- # does the real work. The second script uses 'N' to pair each +- # line-number line with the line containing $LINENO, and appends +- # trailing '-' during substitution so that $LINENO is not a special +- # case at line end. +- # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the +- # scripts with optimization help from Paolo Bonzini. Blame Lee +- # E. McMahon (1931-1989) for sed's syntax. :-) +- sed -n ' +- p +- /[$]LINENO/= +- ' <$as_myself | +- sed ' +- s/[$]LINENO.*/&-/ +- t lineno +- b +- :lineno +- N +- :loop +- s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/ +- t loop +- s/-\n.*// +- ' >$as_me.lineno && +- chmod +x "$as_me.lineno" || +- { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2 +- { (exit 1); exit 1; }; } +- +- # Don't try to exec as it changes $[0], causing all sort of problems +- # (the dirname of $[0] is not the place where we might find the +- # original and so on. Autoconf is especially sensitive to this). +- . "./$as_me.lineno" +- # Exit status is that of the last command. +- exit +-} +- +- +-if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then +- as_dirname=dirname +-else +- as_dirname=false +-fi ++# Avoid depending upon Character Ranges. ++as_cr_letters='abcdefghijklmnopqrstuvwxyz' ++as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' ++as_cr_Letters=$as_cr_letters$as_cr_LETTERS ++as_cr_digits='0123456789' ++as_cr_alnum=$as_cr_Letters$as_cr_digits + + ECHO_C= ECHO_N= ECHO_T= +-case `echo -n x` in ++case `echo -n x` in #((((( + -n*) +- case `echo 'x\c'` in ++ case `echo 'xy\c'` in + *c*) ECHO_T=' ';; # ECHO_T is single tab character. +- *) ECHO_C='\c';; ++ xy) ECHO_C='\c';; ++ *) echo `echo ksh88 bug on AIX 6.1` > /dev/null ++ ECHO_T=' ';; + esac;; + *) + ECHO_N='-n';; + esac + +-if expr a : '\(a\)' >/dev/null 2>&1 && +- test "X`expr 00001 : '.*\(...\)'`" = X001; then +- as_expr=expr +-else +- as_expr=false +-fi +- + rm -f conf$$ conf$$.exe conf$$.file + if test -d conf$$.dir; then + rm -f conf$$.dir/conf$$.file + else + rm -f conf$$.dir +- mkdir conf$$.dir ++ mkdir conf$$.dir 2>/dev/null + fi +-echo >conf$$.file +-if ln -s conf$$.file conf$$ 2>/dev/null; then +- as_ln_s='ln -s' +- # ... but there are two gotchas: +- # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. +- # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. +- # In both cases, we have to default to `cp -p'. +- ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || ++if (echo >conf$$.file) 2>/dev/null; then ++ if ln -s conf$$.file conf$$ 2>/dev/null; then ++ as_ln_s='ln -s' ++ # ... but there are two gotchas: ++ # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. ++ # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. ++ # In both cases, we have to default to `cp -p'. ++ ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || ++ as_ln_s='cp -p' ++ elif ln conf$$.file conf$$ 2>/dev/null; then ++ as_ln_s=ln ++ else + as_ln_s='cp -p' +-elif ln conf$$.file conf$$ 2>/dev/null; then +- as_ln_s=ln ++ fi + else + as_ln_s='cp -p' + fi + rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file + rmdir conf$$.dir 2>/dev/null + ++ ++# as_fn_mkdir_p ++# ------------- ++# Create "$as_dir" as a directory, including parents if necessary. ++as_fn_mkdir_p () ++{ ++ ++ case $as_dir in #( ++ -*) as_dir=./$as_dir;; ++ esac ++ test -d "$as_dir" || eval $as_mkdir_p || { ++ as_dirs= ++ while :; do ++ case $as_dir in #( ++ *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( ++ *) as_qdir=$as_dir;; ++ esac ++ as_dirs="'$as_qdir' $as_dirs" ++ as_dir=`$as_dirname -- "$as_dir" || ++$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ ++ X"$as_dir" : 'X\(//\)[^/]' \| \ ++ X"$as_dir" : 'X\(//\)$' \| \ ++ X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || ++$as_echo X"$as_dir" | ++ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ ++ s//\1/ ++ q ++ } ++ /^X\(\/\/\)[^/].*/{ ++ s//\1/ ++ q ++ } ++ /^X\(\/\/\)$/{ ++ s//\1/ ++ q ++ } ++ /^X\(\/\).*/{ ++ s//\1/ ++ q ++ } ++ s/.*/./; q'` ++ test -d "$as_dir" && break ++ done ++ test -z "$as_dirs" || eval "mkdir $as_dirs" ++ } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir" ++ ++ ++} # as_fn_mkdir_p + if mkdir -p . 2>/dev/null; then +- as_mkdir_p=: ++ as_mkdir_p='mkdir -p "$as_dir"' + else + test -d ./-p && rmdir ./-p + as_mkdir_p=false + fi + +-# Find out whether ``test -x'' works. Don't use a zero-byte file, as +-# systems may use methods other than mode bits to determine executability. +-cat >conf$$.file <<_ASEOF +-#! /bin/sh +-exit 0 +-_ASEOF +-chmod +x conf$$.file +-if test -x conf$$.file >/dev/null 2>&1; then +- as_executable_p="test -x" ++if test -x / >/dev/null 2>&1; then ++ as_test_x='test -x' + else +- as_executable_p=: ++ if ls -dL / >/dev/null 2>&1; then ++ as_ls_L_option=L ++ else ++ as_ls_L_option= ++ fi ++ as_test_x=' ++ eval sh -c '\'' ++ if test -d "$1"; then ++ test -d "$1/."; ++ else ++ case $1 in #( ++ -*)set "./$1";; ++ esac; ++ case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( ++ ???[sx]*):;;*)false;;esac;fi ++ '\'' sh ++ ' + fi +-rm -f conf$$.file ++as_executable_p=$as_test_x + + # Sed expression to map a string onto a valid CPP name. + as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" +@@ -5312,13 +5111,19 @@ + + + exec 6>&1 ++## ----------------------------------- ## ++## Main body of $CONFIG_STATUS script. ## ++## ----------------------------------- ## ++_ASEOF ++test $as_write_fail = 0 && chmod +x $CONFIG_STATUS || ac_write_fail=1 + +-# Save the log message, to keep $[0] and so on meaningful, and to ++cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 ++# Save the log message, to keep $0 and so on meaningful, and to + # report actual input values of CONFIG_FILES etc. instead of their + # values after options handling. + ac_log=" + This file was extended by exmap-console $as_me 0.4.1, which was +-generated by GNU Autoconf 2.60. Invocation command line was ++generated by GNU Autoconf 2.68. Invocation command line was + + CONFIG_FILES = $CONFIG_FILES + CONFIG_HEADERS = $CONFIG_HEADERS +@@ -5331,27 +5136,36 @@ + + _ACEOF + +-cat >>$CONFIG_STATUS <<_ACEOF ++case $ac_config_files in *" ++"*) set x $ac_config_files; shift; ac_config_files=$*;; ++esac ++ ++ ++ ++cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 + # Files that config.status was made for. + config_files="$ac_config_files" + config_commands="$ac_config_commands" + + _ACEOF + +-cat >>$CONFIG_STATUS <<\_ACEOF ++cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 + ac_cs_usage="\ +-\`$as_me' instantiates files from templates according to the +-current configuration. ++\`$as_me' instantiates files and other configuration actions ++from templates according to the current configuration. Unless the files ++and actions are specified as TAGs, all are instantiated by default. + +-Usage: $0 [OPTIONS] [FILE]... ++Usage: $0 [OPTION]... [TAG]... + + -h, --help print this help, then exit +- -V, --version print version number, then exit +- -q, --quiet do not print progress messages ++ -V, --version print version number and configuration settings, then exit ++ --config print configuration, then exit ++ -q, --quiet, --silent ++ do not print progress messages + -d, --debug don't remove temporary files + --recheck update $as_me by reconfiguring in the same conditions +- --file=FILE[:TEMPLATE] +- instantiate the configuration file FILE ++ --file=FILE[:TEMPLATE] ++ instantiate the configuration file FILE + + Configuration files: + $config_files +@@ -5359,36 +5173,44 @@ + Configuration commands: + $config_commands + +-Report bugs to <bug-autoconf@gnu.org>." ++Report bugs to <tf@o-hand.com>." + + _ACEOF +-cat >>$CONFIG_STATUS <<_ACEOF ++cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ++ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" + ac_cs_version="\\ + exmap-console config.status 0.4.1 +-configured by $0, generated by GNU Autoconf 2.60, +- with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" ++configured by $0, generated by GNU Autoconf 2.68, ++ with options \\"\$ac_cs_config\\" + +-Copyright (C) 2006 Free Software Foundation, Inc. ++Copyright (C) 2010 Free Software Foundation, Inc. + This config.status script is free software; the Free Software Foundation + gives unlimited permission to copy, distribute and modify it." + + ac_pwd='$ac_pwd' + srcdir='$srcdir' + INSTALL='$INSTALL' ++MKDIR_P='$MKDIR_P' ++AWK='$AWK' ++test -n "\$AWK" || AWK=awk + _ACEOF + +-cat >>$CONFIG_STATUS <<\_ACEOF +-# If no file are specified by the user, then we need to provide default +-# value. By we need to know if files were specified by the user. ++cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 ++# The default lists apply if the user does not specify any file. + ac_need_defaults=: + while test $# != 0 + do + case $1 in +- --*=*) ++ --*=?*) + ac_option=`expr "X$1" : 'X\([^=]*\)='` + ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'` + ac_shift=: + ;; ++ --*=) ++ ac_option=`expr "X$1" : 'X\([^=]*\)='` ++ ac_optarg= ++ ac_shift=: ++ ;; + *) + ac_option=$1 + ac_optarg=$2 +@@ -5401,25 +5223,30 @@ + -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) + ac_cs_recheck=: ;; + --version | --versio | --versi | --vers | --ver | --ve | --v | -V ) +- echo "$ac_cs_version"; exit ;; ++ $as_echo "$ac_cs_version"; exit ;; ++ --config | --confi | --conf | --con | --co | --c ) ++ $as_echo "$ac_cs_config"; exit ;; + --debug | --debu | --deb | --de | --d | -d ) + debug=: ;; + --file | --fil | --fi | --f ) + $ac_shift +- CONFIG_FILES="$CONFIG_FILES $ac_optarg" ++ case $ac_optarg in ++ *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; ++ '') as_fn_error $? "missing file argument" ;; ++ esac ++ as_fn_append CONFIG_FILES " '$ac_optarg'" + ac_need_defaults=false;; + --he | --h | --help | --hel | -h ) +- echo "$ac_cs_usage"; exit ;; ++ $as_echo "$ac_cs_usage"; exit ;; + -q | -quiet | --quiet | --quie | --qui | --qu | --q \ + | -silent | --silent | --silen | --sile | --sil | --si | --s) + ac_cs_silent=: ;; + + # This is an error. +- -*) { echo "$as_me: error: unrecognized option: $1 +-Try \`$0 --help' for more information." >&2 +- { (exit 1); exit 1; }; } ;; ++ -*) as_fn_error $? "unrecognized option: \`$1' ++Try \`$0 --help' for more information." ;; + +- *) ac_config_targets="$ac_config_targets $1" ++ *) as_fn_append ac_config_targets " $1" + ac_need_defaults=false ;; + + esac +@@ -5434,27 +5261,29 @@ + fi + + _ACEOF +-cat >>$CONFIG_STATUS <<_ACEOF ++cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 + if \$ac_cs_recheck; then +- echo "running CONFIG_SHELL=$SHELL $SHELL $0 "$ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6 +- CONFIG_SHELL=$SHELL ++ set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion ++ shift ++ \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6 ++ CONFIG_SHELL='$SHELL' + export CONFIG_SHELL +- exec $SHELL "$0"$ac_configure_args \$ac_configure_extra_args --no-create --no-recursion ++ exec "\$@" + fi + + _ACEOF +-cat >>$CONFIG_STATUS <<\_ACEOF ++cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 + exec 5>>config.log + { + echo + sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX + ## Running $as_me. ## + _ASBOX +- echo "$ac_log" ++ $as_echo "$ac_log" + } >&5 + + _ACEOF +-cat >>$CONFIG_STATUS <<_ACEOF ++cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 + # + # INIT-COMMANDS + # +@@ -5462,7 +5291,7 @@ + + _ACEOF + +-cat >>$CONFIG_STATUS <<\_ACEOF ++cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 + + # Handling of arguments. + for ac_config_target in $ac_config_targets +@@ -5473,9 +5302,7 @@ + "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;; + "doc/Makefile") CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;; + +- *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 +-echo "$as_me: error: invalid argument: $ac_config_target" >&2;} +- { (exit 1); exit 1; }; };; ++ *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; + esac + done + +@@ -5497,200 +5324,194 @@ + # after its creation but before its name has been assigned to `$tmp'. + $debug || + { +- tmp= ++ tmp= ac_tmp= + trap 'exit_status=$? +- { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status ++ : "${ac_tmp:=$tmp}" ++ { test ! -d "$ac_tmp" || rm -fr "$ac_tmp"; } && exit $exit_status + ' 0 +- trap '{ (exit 1); exit 1; }' 1 2 13 15 ++ trap 'as_fn_exit 1' 1 2 13 15 + } + # Create a (secure) tmp directory for tmp files. + + { + tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` && +- test -n "$tmp" && test -d "$tmp" ++ test -d "$tmp" + } || + { + tmp=./conf$$-$RANDOM + (umask 077 && mkdir "$tmp") +-} || +-{ +- echo "$me: cannot create a temporary directory in ." >&2 +- { (exit 1); exit 1; } +-} +- +-# +-# Set up the sed scripts for CONFIG_FILES section. +-# ++} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5 ++ac_tmp=$tmp + +-# No need to generate the scripts if there are no CONFIG_FILES. +-# This happens for instance when ./config.status config.h ++# Set up the scripts for CONFIG_FILES section. ++# No need to generate them if there are no CONFIG_FILES. ++# This happens for instance with `./config.status config.h'. + if test -n "$CONFIG_FILES"; then + +-_ACEOF + ++ac_cr=`echo X | tr X '\015'` ++# On cygwin, bash can eat \r inside `` if the user requested igncr. ++# But we know of no other shell where ac_cr would be empty at this ++# point, so we can use a bashism as a fallback. ++if test "x$ac_cr" = x; then ++ eval ac_cr=\$\'\\r\' ++fi ++ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null` ++if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then ++ ac_cs_awk_cr='\\r' ++else ++ ac_cs_awk_cr=$ac_cr ++fi ++ ++echo 'BEGIN {' >"$ac_tmp/subs1.awk" && ++_ACEOF + + ++{ ++ echo "cat >conf$$subs.awk <<_ACEOF" && ++ echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' && ++ echo "_ACEOF" ++} >conf$$subs.sh || ++ as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 ++ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'` + ac_delim='%!_!# ' + for ac_last_try in false false false false false :; do +- cat >conf$$subs.sed <<_ACEOF +-SHELL!$SHELL$ac_delim +-PATH_SEPARATOR!$PATH_SEPARATOR$ac_delim +-PACKAGE_NAME!$PACKAGE_NAME$ac_delim +-PACKAGE_TARNAME!$PACKAGE_TARNAME$ac_delim +-PACKAGE_VERSION!$PACKAGE_VERSION$ac_delim +-PACKAGE_STRING!$PACKAGE_STRING$ac_delim +-PACKAGE_BUGREPORT!$PACKAGE_BUGREPORT$ac_delim +-exec_prefix!$exec_prefix$ac_delim +-prefix!$prefix$ac_delim +-program_transform_name!$program_transform_name$ac_delim +-bindir!$bindir$ac_delim +-sbindir!$sbindir$ac_delim +-libexecdir!$libexecdir$ac_delim +-datarootdir!$datarootdir$ac_delim +-datadir!$datadir$ac_delim +-sysconfdir!$sysconfdir$ac_delim +-sharedstatedir!$sharedstatedir$ac_delim +-localstatedir!$localstatedir$ac_delim +-includedir!$includedir$ac_delim +-oldincludedir!$oldincludedir$ac_delim +-docdir!$docdir$ac_delim +-infodir!$infodir$ac_delim +-htmldir!$htmldir$ac_delim +-dvidir!$dvidir$ac_delim +-pdfdir!$pdfdir$ac_delim +-psdir!$psdir$ac_delim +-libdir!$libdir$ac_delim +-localedir!$localedir$ac_delim +-mandir!$mandir$ac_delim +-DEFS!$DEFS$ac_delim +-ECHO_C!$ECHO_C$ac_delim +-ECHO_N!$ECHO_N$ac_delim +-ECHO_T!$ECHO_T$ac_delim +-LIBS!$LIBS$ac_delim +-build_alias!$build_alias$ac_delim +-host_alias!$host_alias$ac_delim +-target_alias!$target_alias$ac_delim +-INSTALL_PROGRAM!$INSTALL_PROGRAM$ac_delim +-INSTALL_SCRIPT!$INSTALL_SCRIPT$ac_delim +-INSTALL_DATA!$INSTALL_DATA$ac_delim +-CYGPATH_W!$CYGPATH_W$ac_delim +-PACKAGE!$PACKAGE$ac_delim +-VERSION!$VERSION$ac_delim +-ACLOCAL!$ACLOCAL$ac_delim +-AUTOCONF!$AUTOCONF$ac_delim +-AUTOMAKE!$AUTOMAKE$ac_delim +-AUTOHEADER!$AUTOHEADER$ac_delim +-MAKEINFO!$MAKEINFO$ac_delim +-install_sh!$install_sh$ac_delim +-STRIP!$STRIP$ac_delim +-INSTALL_STRIP_PROGRAM!$INSTALL_STRIP_PROGRAM$ac_delim +-mkdir_p!$mkdir_p$ac_delim +-AWK!$AWK$ac_delim +-SET_MAKE!$SET_MAKE$ac_delim +-am__leading_dot!$am__leading_dot$ac_delim +-AMTAR!$AMTAR$ac_delim +-am__tar!$am__tar$ac_delim +-am__untar!$am__untar$ac_delim +-CC!$CC$ac_delim +-CFLAGS!$CFLAGS$ac_delim +-LDFLAGS!$LDFLAGS$ac_delim +-CPPFLAGS!$CPPFLAGS$ac_delim +-ac_ct_CC!$ac_ct_CC$ac_delim +-EXEEXT!$EXEEXT$ac_delim +-OBJEXT!$OBJEXT$ac_delim +-DEPDIR!$DEPDIR$ac_delim +-am__include!$am__include$ac_delim +-am__quote!$am__quote$ac_delim +-AMDEP_TRUE!$AMDEP_TRUE$ac_delim +-AMDEP_FALSE!$AMDEP_FALSE$ac_delim +-AMDEPBACKSLASH!$AMDEPBACKSLASH$ac_delim +-CCDEPMODE!$CCDEPMODE$ac_delim +-am__fastdepCC_TRUE!$am__fastdepCC_TRUE$ac_delim +-am__fastdepCC_FALSE!$am__fastdepCC_FALSE$ac_delim +-INTERACTIVE_TRUE!$INTERACTIVE_TRUE$ac_delim +-INTERACTIVE_FALSE!$INTERACTIVE_FALSE$ac_delim +-READLINE_LIBS!$READLINE_LIBS$ac_delim +-READLINE_CFLAGS!$READLINE_CFLAGS$ac_delim +-DODOCS_TRUE!$DODOCS_TRUE$ac_delim +-DODOCS_FALSE!$DODOCS_FALSE$ac_delim +-PKG_CONFIG!$PKG_CONFIG$ac_delim +-GLIB_CFLAGS!$GLIB_CFLAGS$ac_delim +-GLIB_LIBS!$GLIB_LIBS$ac_delim +-HELPTOMAN!$HELPTOMAN$ac_delim +-HAVE_HELPTOMAN_TRUE!$HAVE_HELPTOMAN_TRUE$ac_delim +-HAVE_HELPTOMAN_FALSE!$HAVE_HELPTOMAN_FALSE$ac_delim +-GCC_CFLAGS!$GCC_CFLAGS$ac_delim +-LIBOBJS!$LIBOBJS$ac_delim +-LTLIBOBJS!$LTLIBOBJS$ac_delim +-_ACEOF ++ . ./conf$$subs.sh || ++ as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 + +- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 89; then ++ ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X` ++ if test $ac_delim_n = $ac_delim_num; then + break + elif $ac_last_try; then +- { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 +-echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 + else + ac_delim="$ac_delim!$ac_delim _$ac_delim!! " + fi + done ++rm -f conf$$subs.sh + +-ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed` +-if test -n "$ac_eof"; then +- ac_eof=`echo "$ac_eof" | sort -nru | sed 1q` +- ac_eof=`expr $ac_eof + 1` +-fi +- +-cat >>$CONFIG_STATUS <<_ACEOF +-cat >"\$tmp/subs-1.sed" <<\CEOF$ac_eof +-/@[a-zA-Z_][a-zA-Z_0-9]*@/!b end +-_ACEOF +-sed ' +-s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g +-s/^/s,@/; s/!/@,|#_!!_#|/ +-:n +-t n +-s/'"$ac_delim"'$/,g/; t +-s/$/\\/; p +-N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n +-' >>$CONFIG_STATUS <conf$$subs.sed +-rm -f conf$$subs.sed +-cat >>$CONFIG_STATUS <<_ACEOF +-:end +-s/|#_!!_#|//g +-CEOF$ac_eof ++cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ++cat >>"\$ac_tmp/subs1.awk" <<\\_ACAWK && + _ACEOF ++sed -n ' ++h ++s/^/S["/; s/!.*/"]=/ ++p ++g ++s/^[^!]*!// ++:repl ++t repl ++s/'"$ac_delim"'$// ++t delim ++:nl ++h ++s/\(.\{148\}\)..*/\1/ ++t more1 ++s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/ ++p ++n ++b repl ++:more1 ++s/["\\]/\\&/g; s/^/"/; s/$/"\\/ ++p ++g ++s/.\{148\}// ++t nl ++:delim ++h ++s/\(.\{148\}\)..*/\1/ ++t more2 ++s/["\\]/\\&/g; s/^/"/; s/$/"/ ++p ++b ++:more2 ++s/["\\]/\\&/g; s/^/"/; s/$/"\\/ ++p ++g ++s/.\{148\}// ++t delim ++' <conf$$subs.awk | sed ' ++/^[^""]/{ ++ N ++ s/\n// ++} ++' >>$CONFIG_STATUS || ac_write_fail=1 ++rm -f conf$$subs.awk ++cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ++_ACAWK ++cat >>"\$ac_tmp/subs1.awk" <<_ACAWK && ++ for (key in S) S_is_set[key] = 1 ++ FS = "" ++ ++} ++{ ++ line = $ 0 ++ nfields = split(line, field, "@") ++ substed = 0 ++ len = length(field[1]) ++ for (i = 2; i < nfields; i++) { ++ key = field[i] ++ keylen = length(key) ++ if (S_is_set[key]) { ++ value = S[key] ++ line = substr(line, 1, len) "" value "" substr(line, len + keylen + 3) ++ len += length(value) + length(field[++i]) ++ substed = 1 ++ } else ++ len += 1 + keylen ++ } ++ ++ print line ++} + ++_ACAWK ++_ACEOF ++cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 ++if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then ++ sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g" ++else ++ cat ++fi < "$ac_tmp/subs1.awk" > "$ac_tmp/subs.awk" \ ++ || as_fn_error $? "could not setup config files machinery" "$LINENO" 5 ++_ACEOF + +-# VPATH may cause trouble with some makes, so we remove $(srcdir), +-# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and ++# VPATH may cause trouble with some makes, so we remove sole $(srcdir), ++# ${srcdir} and @srcdir@ entries from VPATH if srcdir is ".", strip leading and + # trailing colons and then remove the whole line if VPATH becomes empty + # (actually we leave an empty line to preserve line numbers). + if test "x$srcdir" = x.; then +- ac_vpsub='/^[ ]*VPATH[ ]*=/{ +-s/:*\$(srcdir):*/:/ +-s/:*\${srcdir}:*/:/ +-s/:*@srcdir@:*/:/ +-s/^\([^=]*=[ ]*\):*/\1/ ++ ac_vpsub='/^[ ]*VPATH[ ]*=[ ]*/{ ++h ++s/// ++s/^/:/ ++s/[ ]*$/:/ ++s/:\$(srcdir):/:/g ++s/:\${srcdir}:/:/g ++s/:@srcdir@:/:/g ++s/^:*// + s/:*$// ++x ++s/\(=[ ]*\).*/\1/ ++G ++s/\n// + s/^[^=]*=[ ]*$// + }' + fi + +-cat >>$CONFIG_STATUS <<\_ACEOF ++cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 + fi # test -n "$CONFIG_FILES" + + +-for ac_tag in :F $CONFIG_FILES :C $CONFIG_COMMANDS ++eval set X " :F $CONFIG_FILES :C $CONFIG_COMMANDS" ++shift ++for ac_tag + do + case $ac_tag in + :[FHLC]) ac_mode=$ac_tag; continue;; + esac + case $ac_mode$ac_tag in + :[FHL]*:*);; +- :L* | :C*:*) { { echo "$as_me:$LINENO: error: Invalid tag $ac_tag." >&5 +-echo "$as_me: error: Invalid tag $ac_tag." >&2;} +- { (exit 1); exit 1; }; };; ++ :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;; + :[FH]-) ac_tag=-:-;; + :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; + esac +@@ -5709,7 +5530,7 @@ + for ac_f + do + case $ac_f in +- -) ac_f="$tmp/stdin";; ++ -) ac_f="$ac_tmp/stdin";; + *) # Look for the file first in the build tree, then in the source tree + # (if the path is not absolute). The absolute path cannot be DOS-style, + # because $ac_f cannot contain `:'. +@@ -5718,26 +5539,34 @@ + [\\/$]*) false;; + *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; + esac || +- { { echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5 +-echo "$as_me: error: cannot find input file: $ac_f" >&2;} +- { (exit 1); exit 1; }; };; ++ as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;; + esac +- ac_file_inputs="$ac_file_inputs $ac_f" ++ case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac ++ as_fn_append ac_file_inputs " '$ac_f'" + done + + # Let's still pretend it is `configure' which instantiates (i.e., don't + # use $as_me), people would be surprised to read: + # /* config.h. Generated by config.status. */ +- configure_input="Generated from "`IFS=: +- echo $* | sed 's|^[^:]*/||;s|:[^:]*/|, |g'`" by configure." ++ configure_input='Generated from '` ++ $as_echo "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g' ++ `' by configure.' + if test x"$ac_file" != x-; then + configure_input="$ac_file. $configure_input" +- { echo "$as_me:$LINENO: creating $ac_file" >&5 +-echo "$as_me: creating $ac_file" >&6;} ++ { $as_echo "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5 ++$as_echo "$as_me: creating $ac_file" >&6;} + fi ++ # Neutralize special characters interpreted by sed in replacement strings. ++ case $configure_input in #( ++ *\&* | *\|* | *\\* ) ++ ac_sed_conf_input=`$as_echo "$configure_input" | ++ sed 's/[\\\\&|]/\\\\&/g'`;; #( ++ *) ac_sed_conf_input=$configure_input;; ++ esac + + case $ac_tag in +- *:-:* | *:-) cat >"$tmp/stdin";; ++ *:-:* | *:-) cat >"$ac_tmp/stdin" \ ++ || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; + esac + ;; + esac +@@ -5747,42 +5576,7 @@ + X"$ac_file" : 'X\(//\)[^/]' \| \ + X"$ac_file" : 'X\(//\)$' \| \ + X"$ac_file" : 'X\(/\)' \| . 2>/dev/null || +-echo X"$ac_file" | +- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ +- s//\1/ +- q +- } +- /^X\(\/\/\)[^/].*/{ +- s//\1/ +- q +- } +- /^X\(\/\/\)$/{ +- s//\1/ +- q +- } +- /^X\(\/\).*/{ +- s//\1/ +- q +- } +- s/.*/./; q'` +- { as_dir="$ac_dir" +- case $as_dir in #( +- -*) as_dir=./$as_dir;; +- esac +- test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || { +- as_dirs= +- while :; do +- case $as_dir in #( +- *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #( +- *) as_qdir=$as_dir;; +- esac +- as_dirs="'$as_qdir' $as_dirs" +- as_dir=`$as_dirname -- "$as_dir" || +-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ +- X"$as_dir" : 'X\(//\)[^/]' \| \ +- X"$as_dir" : 'X\(//\)$' \| \ +- X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || +-echo X"$as_dir" | ++$as_echo X"$ac_file" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q +@@ -5800,20 +5594,15 @@ + q + } + s/.*/./; q'` +- test -d "$as_dir" && break +- done +- test -z "$as_dirs" || eval "mkdir $as_dirs" +- } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5 +-echo "$as_me: error: cannot create directory $as_dir" >&2;} +- { (exit 1); exit 1; }; }; } ++ as_dir="$ac_dir"; as_fn_mkdir_p + ac_builddir=. + + case "$ac_dir" in + .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; + *) +- ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'` ++ ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'` + # A ".." for each directory in $ac_dir_suffix. +- ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'` ++ ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'` + case $ac_top_builddir_sub in + "") ac_top_builddir_sub=. ac_top_build_prefix= ;; + *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; +@@ -5851,14 +5640,19 @@ + [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;; + *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;; + esac ++ ac_MKDIR_P=$MKDIR_P ++ case $MKDIR_P in ++ [\\/$]* | ?:[\\/]* ) ;; ++ */*) ac_MKDIR_P=$ac_top_build_prefix$MKDIR_P ;; ++ esac + _ACEOF + +-cat >>$CONFIG_STATUS <<\_ACEOF ++cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 + # If the template does not know about datarootdir, expand it. + # FIXME: This hack should be removed a few years after 2.60. + ac_datarootdir_hack=; ac_datarootdir_seen= +- +-case `sed -n '/datarootdir/ { ++ac_sed_dataroot=' ++/datarootdir/ { + p + q + } +@@ -5866,36 +5660,37 @@ + /@docdir@/p + /@infodir@/p + /@localedir@/p +-/@mandir@/p +-' $ac_file_inputs` in ++/@mandir@/p' ++case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in + *datarootdir*) ac_datarootdir_seen=yes;; + *@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*) +- { echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5 +-echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;} ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5 ++$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;} + _ACEOF +-cat >>$CONFIG_STATUS <<_ACEOF ++cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 + ac_datarootdir_hack=' + s&@datadir@&$datadir&g + s&@docdir@&$docdir&g + s&@infodir@&$infodir&g + s&@localedir@&$localedir&g + s&@mandir@&$mandir&g +- s&\\\${datarootdir}&$datarootdir&g' ;; ++ s&\\\${datarootdir}&$datarootdir&g' ;; + esac + _ACEOF + + # Neutralize VPATH when `$srcdir' = `.'. + # Shell code in configure.ac might set extrasub. + # FIXME: do we really want to maintain this feature? +-cat >>$CONFIG_STATUS <<_ACEOF +- sed "$ac_vpsub ++cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ++ac_sed_extra="$ac_vpsub + $extrasub + _ACEOF +-cat >>$CONFIG_STATUS <<\_ACEOF ++cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 + :t + /@[a-zA-Z_][a-zA-Z_0-9]*@/!b +-s&@configure_input@&$configure_input&;t t ++s|@configure_input@|$ac_sed_conf_input|;t t + s&@top_builddir@&$ac_top_builddir_sub&;t t ++s&@top_build_prefix@&$ac_top_build_prefix&;t t + s&@srcdir@&$ac_srcdir&;t t + s&@abs_srcdir@&$ac_abs_srcdir&;t t + s&@top_srcdir@&$ac_top_srcdir&;t t +@@ -5904,48 +5699,64 @@ + s&@abs_builddir@&$ac_abs_builddir&;t t + s&@abs_top_builddir@&$ac_abs_top_builddir&;t t + s&@INSTALL@&$ac_INSTALL&;t t ++s&@MKDIR_P@&$ac_MKDIR_P&;t t + $ac_datarootdir_hack +-" $ac_file_inputs | sed -f "$tmp/subs-1.sed" >$tmp/out ++" ++eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$ac_tmp/subs.awk" \ ++ >$ac_tmp/out || as_fn_error $? "could not create $ac_file" "$LINENO" 5 + + test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && +- { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } && +- { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } && +- { echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir' +-which seems to be undefined. Please make sure it is defined." >&5 +-echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' +-which seems to be undefined. Please make sure it is defined." >&2;} ++ { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } && ++ { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' \ ++ "$ac_tmp/out"`; test -z "$ac_out"; } && ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir' ++which seems to be undefined. Please make sure it is defined" >&5 ++$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' ++which seems to be undefined. Please make sure it is defined" >&2;} + +- rm -f "$tmp/stdin" ++ rm -f "$ac_tmp/stdin" + case $ac_file in +- -) cat "$tmp/out"; rm -f "$tmp/out";; +- *) rm -f "$ac_file"; mv "$tmp/out" $ac_file;; +- esac ++ -) cat "$ac_tmp/out" && rm -f "$ac_tmp/out";; ++ *) rm -f "$ac_file" && mv "$ac_tmp/out" "$ac_file";; ++ esac \ ++ || as_fn_error $? "could not create $ac_file" "$LINENO" 5 + ;; + + +- :C) { echo "$as_me:$LINENO: executing $ac_file commands" >&5 +-echo "$as_me: executing $ac_file commands" >&6;} ++ :C) { $as_echo "$as_me:${as_lineno-$LINENO}: executing $ac_file commands" >&5 ++$as_echo "$as_me: executing $ac_file commands" >&6;} + ;; + esac + + + case $ac_file$ac_mode in +- "depfiles":C) test x"$AMDEP_TRUE" != x"" || for mf in $CONFIG_FILES; do +- # Strip MF so we end up with the name of the file. +- mf=`echo "$mf" | sed -e 's/:.*$//'` +- # Check whether this is an Automake generated Makefile or not. +- # We used to match only the files named `Makefile.in', but +- # some people rename them; so instead we look at the file content. +- # Grep'ing the first line is not enough: some people post-process +- # each Makefile.in and add a new line on top of each file to say so. +- # So let's grep whole file. +- if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then +- dirpart=`$as_dirname -- "$mf" || ++ "depfiles":C) test x"$AMDEP_TRUE" != x"" || { ++ # Autoconf 2.62 quotes --file arguments for eval, but not when files ++ # are listed without --file. Let's play safe and only enable the eval ++ # if we detect the quoting. ++ case $CONFIG_FILES in ++ *\'*) eval set x "$CONFIG_FILES" ;; ++ *) set x $CONFIG_FILES ;; ++ esac ++ shift ++ for mf ++ do ++ # Strip MF so we end up with the name of the file. ++ mf=`echo "$mf" | sed -e 's/:.*$//'` ++ # Check whether this is an Automake generated Makefile or not. ++ # We used to match only the files named `Makefile.in', but ++ # some people rename them; so instead we look at the file content. ++ # Grep'ing the first line is not enough: some people post-process ++ # each Makefile.in and add a new line on top of each file to say so. ++ # Grep'ing the whole file is not good either: AIX grep has a line ++ # limit of 2048, but all sed's we know have understand at least 4000. ++ if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then ++ dirpart=`$as_dirname -- "$mf" || + $as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$mf" : 'X\(//\)[^/]' \| \ + X"$mf" : 'X\(//\)$' \| \ + X"$mf" : 'X\(/\)' \| . 2>/dev/null || +-echo X"$mf" | ++$as_echo X"$mf" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q +@@ -5963,68 +5774,33 @@ + q + } + s/.*/./; q'` +- else +- continue +- fi +- # Extract the definition of DEPDIR, am__include, and am__quote +- # from the Makefile without running `make'. +- DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` +- test -z "$DEPDIR" && continue +- am__include=`sed -n 's/^am__include = //p' < "$mf"` +- test -z "am__include" && continue +- am__quote=`sed -n 's/^am__quote = //p' < "$mf"` +- # When using ansi2knr, U may be empty or an underscore; expand it +- U=`sed -n 's/^U = //p' < "$mf"` +- # Find all dependency output files, they are included files with +- # $(DEPDIR) in their names. We invoke sed twice because it is the +- # simplest approach to changing $(DEPDIR) to its actual value in the +- # expansion. +- for file in `sed -n " +- s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ +- sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do +- # Make sure the directory exists. +- test -f "$dirpart/$file" && continue +- fdir=`$as_dirname -- "$file" || ++ else ++ continue ++ fi ++ # Extract the definition of DEPDIR, am__include, and am__quote ++ # from the Makefile without running `make'. ++ DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` ++ test -z "$DEPDIR" && continue ++ am__include=`sed -n 's/^am__include = //p' < "$mf"` ++ test -z "am__include" && continue ++ am__quote=`sed -n 's/^am__quote = //p' < "$mf"` ++ # When using ansi2knr, U may be empty or an underscore; expand it ++ U=`sed -n 's/^U = //p' < "$mf"` ++ # Find all dependency output files, they are included files with ++ # $(DEPDIR) in their names. We invoke sed twice because it is the ++ # simplest approach to changing $(DEPDIR) to its actual value in the ++ # expansion. ++ for file in `sed -n " ++ s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ ++ sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do ++ # Make sure the directory exists. ++ test -f "$dirpart/$file" && continue ++ fdir=`$as_dirname -- "$file" || + $as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$file" : 'X\(//\)[^/]' \| \ + X"$file" : 'X\(//\)$' \| \ + X"$file" : 'X\(/\)' \| . 2>/dev/null || +-echo X"$file" | +- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ +- s//\1/ +- q +- } +- /^X\(\/\/\)[^/].*/{ +- s//\1/ +- q +- } +- /^X\(\/\/\)$/{ +- s//\1/ +- q +- } +- /^X\(\/\).*/{ +- s//\1/ +- q +- } +- s/.*/./; q'` +- { as_dir=$dirpart/$fdir +- case $as_dir in #( +- -*) as_dir=./$as_dir;; +- esac +- test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || { +- as_dirs= +- while :; do +- case $as_dir in #( +- *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #( +- *) as_qdir=$as_dir;; +- esac +- as_dirs="'$as_qdir' $as_dirs" +- as_dir=`$as_dirname -- "$as_dir" || +-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ +- X"$as_dir" : 'X\(//\)[^/]' \| \ +- X"$as_dir" : 'X\(//\)$' \| \ +- X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || +-echo X"$as_dir" | ++$as_echo X"$file" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q +@@ -6042,27 +5818,25 @@ + q + } + s/.*/./; q'` +- test -d "$as_dir" && break ++ as_dir=$dirpart/$fdir; as_fn_mkdir_p ++ # echo "creating $dirpart/$file" ++ echo '# dummy' > "$dirpart/$file" + done +- test -z "$as_dirs" || eval "mkdir $as_dirs" +- } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5 +-echo "$as_me: error: cannot create directory $as_dir" >&2;} +- { (exit 1); exit 1; }; }; } +- # echo "creating $dirpart/$file" +- echo '# dummy' > "$dirpart/$file" + done +-done ++} + ;; + + esac + done # for ac_tag + + +-{ (exit 0); exit 0; } ++as_fn_exit 0 + _ACEOF +-chmod +x $CONFIG_STATUS + ac_clean_files=$ac_clean_files_save + ++test $ac_write_fail = 0 || ++ as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5 ++ + + # configure is writing to config.log, and then calls config.status. + # config.status does its own redirection, appending to config.log. +@@ -6082,14 +5856,18 @@ + exec 5>>config.log + # Use ||, not &&, to avoid exiting from the if with $? = 1, which + # would make configure fail if this is the last instruction. +- $ac_cs_success || { (exit 1); exit 1; } ++ $ac_cs_success || as_fn_exit 1 ++fi ++if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5 ++$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;} + fi + + + if test x$WITH_READLINE = xerror ; then +- { echo "$as_me:$LINENO: result: WARNING: Could not link against readline libraries; interactive mode will not be available." >&5 +-echo "${ECHO_T}WARNING: Could not link against readline libraries; interactive mode will not be available." >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: WARNING: Could not link against readline libraries; interactive mode will not be available." >&5 ++$as_echo "WARNING: Could not link against readline libraries; interactive mode will not be available." >&6; } + fi + +-{ echo "$as_me:$LINENO: result: Type make to build exmap-console." >&5 +-echo "${ECHO_T}Type make to build exmap-console." >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: Type make to build exmap-console." >&5 ++$as_echo "Type make to build exmap-console." >&6; } +diff -Nur exmap-console-0.4.1.orig/configure.ac exmap-console-0.4.1/configure.ac +--- exmap-console-0.4.1.orig/configure.ac 2007-02-26 12:00:48.000000000 +0100 ++++ exmap-console-0.4.1/configure.ac 2011-01-11 12:44:09.000000000 +0100 +@@ -46,10 +46,6 @@ + + AM_CONDITIONAL(DODOCS, test "x$DO_DOCS" != "xno") + +-AC_ARG_ENABLE(debug, AS_HELP_STRING([--enable-debug], +- [Enable debuggin information]), +- [CFLAGS="-g -O0"], [CFLAGS="-g -O2"]) +- + CFLAGS="$CFLAGS -DEXMAP_VERSION=\\\"$EXMAP_VERSION\\\" -DEXMAP_PROTOCOL_VERSION=\\\"$EXMAP_PROTOCOL_VERSION\\\"" + + AC_SUBST(CFLAGS) +diff -Nur exmap-console-0.4.1.orig/depcomp exmap-console-0.4.1/depcomp +--- exmap-console-0.4.1.orig/depcomp 2007-02-26 12:44:02.000000000 +0100 ++++ exmap-console-0.4.1/depcomp 2011-01-11 12:44:16.000000000 +0100 +@@ -1,9 +1,10 @@ + #! /bin/sh + # depcomp - compile a program generating dependencies as side-effects + +-scriptversion=2005-07-09.11 ++scriptversion=2009-04-28.21; # UTC + +-# Copyright (C) 1999, 2000, 2003, 2004, 2005 Free Software Foundation, Inc. ++# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009 Free ++# Software Foundation, Inc. + + # This program is free software; you can redistribute it and/or modify + # it under the terms of the GNU General Public License as published by +@@ -16,9 +17,7 @@ + # GNU General Public License for more details. + + # You should have received a copy of the GNU General Public License +-# along with this program; if not, write to the Free Software +-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA +-# 02110-1301, USA. ++# along with this program. If not, see <http://www.gnu.org/licenses/>. + + # As a special exception to the GNU General Public License, if you + # distribute this file as part of a program that contains a +@@ -86,12 +85,34 @@ + depmode=dashmstdout + fi + ++cygpath_u="cygpath -u -f -" ++if test "$depmode" = msvcmsys; then ++ # This is just like msvisualcpp but w/o cygpath translation. ++ # Just convert the backslash-escaped backslashes to single forward ++ # slashes to satisfy depend.m4 ++ cygpath_u="sed s,\\\\\\\\,/,g" ++ depmode=msvisualcpp ++fi ++ + case "$depmode" in + gcc3) + ## gcc 3 implements dependency tracking that does exactly what + ## we want. Yay! Note: for some reason libtool 1.4 doesn't like + ## it if -MD -MP comes after the -MF stuff. Hmm. +- "$@" -MT "$object" -MD -MP -MF "$tmpdepfile" ++## Unfortunately, FreeBSD c89 acceptance of flags depends upon ++## the command line argument order; so add the flags where they ++## appear in depend2.am. Note that the slowdown incurred here ++## affects only configure: in makefiles, %FASTDEP% shortcuts this. ++ for arg ++ do ++ case $arg in ++ -c) set fnord "$@" -MT "$object" -MD -MP -MF "$tmpdepfile" "$arg" ;; ++ *) set fnord "$@" "$arg" ;; ++ esac ++ shift # fnord ++ shift # $arg ++ done ++ "$@" + stat=$? + if test $stat -eq 0; then : + else +@@ -178,14 +199,14 @@ + ' < "$tmpdepfile" \ + | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \ + tr ' +-' ' ' >> $depfile +- echo >> $depfile ++' ' ' >> "$depfile" ++ echo >> "$depfile" + + # The second pass generates a dummy entry for each header file. + tr ' ' ' + ' < "$tmpdepfile" \ + | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \ +- >> $depfile ++ >> "$depfile" + else + # The sourcefile does not contain any dependencies, so just + # store a dummy comment line, to avoid errors with the Makefile +@@ -201,34 +222,39 @@ + # current directory. Also, the AIX compiler puts `$object:' at the + # start of each line; $object doesn't have directory information. + # Version 6 uses the directory in both cases. +- stripped=`echo "$object" | sed 's/\(.*\)\..*$/\1/'` +- tmpdepfile="$stripped.u" ++ dir=`echo "$object" | sed -e 's|/[^/]*$|/|'` ++ test "x$dir" = "x$object" && dir= ++ base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'` + if test "$libtool" = yes; then ++ tmpdepfile1=$dir$base.u ++ tmpdepfile2=$base.u ++ tmpdepfile3=$dir.libs/$base.u + "$@" -Wc,-M + else ++ tmpdepfile1=$dir$base.u ++ tmpdepfile2=$dir$base.u ++ tmpdepfile3=$dir$base.u + "$@" -M + fi + stat=$? + +- if test -f "$tmpdepfile"; then : +- else +- stripped=`echo "$stripped" | sed 's,^.*/,,'` +- tmpdepfile="$stripped.u" +- fi +- + if test $stat -eq 0; then : + else +- rm -f "$tmpdepfile" ++ rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" + exit $stat + fi + ++ for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" ++ do ++ test -f "$tmpdepfile" && break ++ done + if test -f "$tmpdepfile"; then +- outname="$stripped.o" + # Each line is of the form `foo.o: dependent.h'. + # Do two passes, one to just change these to + # `$object: dependent.h' and one to simply `dependent.h:'. +- sed -e "s,^$outname:,$object :," < "$tmpdepfile" > "$depfile" +- sed -e "s,^$outname: \(.*\)$,\1:," < "$tmpdepfile" >> "$depfile" ++ sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile" ++ # That's a tab and a space in the []. ++ sed -e 's,^.*\.[a-z]*:[ ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile" + else + # The sourcefile does not contain any dependencies, so just + # store a dummy comment line, to avoid errors with the Makefile +@@ -276,6 +302,51 @@ + rm -f "$tmpdepfile" + ;; + ++hp2) ++ # The "hp" stanza above does not work with aCC (C++) and HP's ia64 ++ # compilers, which have integrated preprocessors. The correct option ++ # to use with these is +Maked; it writes dependencies to a file named ++ # 'foo.d', which lands next to the object file, wherever that ++ # happens to be. ++ # Much of this is similar to the tru64 case; see comments there. ++ dir=`echo "$object" | sed -e 's|/[^/]*$|/|'` ++ test "x$dir" = "x$object" && dir= ++ base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'` ++ if test "$libtool" = yes; then ++ tmpdepfile1=$dir$base.d ++ tmpdepfile2=$dir.libs/$base.d ++ "$@" -Wc,+Maked ++ else ++ tmpdepfile1=$dir$base.d ++ tmpdepfile2=$dir$base.d ++ "$@" +Maked ++ fi ++ stat=$? ++ if test $stat -eq 0; then : ++ else ++ rm -f "$tmpdepfile1" "$tmpdepfile2" ++ exit $stat ++ fi ++ ++ for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" ++ do ++ test -f "$tmpdepfile" && break ++ done ++ if test -f "$tmpdepfile"; then ++ sed -e "s,^.*\.[a-z]*:,$object:," "$tmpdepfile" > "$depfile" ++ # Add `dependent.h:' lines. ++ sed -ne '2,${ ++ s/^ *// ++ s/ \\*$// ++ s/$/:/ ++ p ++ }' "$tmpdepfile" >> "$depfile" ++ else ++ echo "#dummy" > "$depfile" ++ fi ++ rm -f "$tmpdepfile" "$tmpdepfile2" ++ ;; ++ + tru64) + # The Tru64 compiler uses -MD to generate dependencies as a side + # effect. `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'. +@@ -288,13 +359,13 @@ + + if test "$libtool" = yes; then + # With Tru64 cc, shared objects can also be used to make a +- # static library. This mecanism is used in libtool 1.4 series to ++ # static library. This mechanism is used in libtool 1.4 series to + # handle both shared and static libraries in a single compilation. + # With libtool 1.4, dependencies were output in $dir.libs/$base.lo.d. + # + # With libtool 1.5 this exception was removed, and libtool now + # generates 2 separate objects for the 2 libraries. These two +- # compilations output dependencies in in $dir.libs/$base.o.d and ++ # compilations output dependencies in $dir.libs/$base.o.d and + # in $dir$base.o.d. We have to check for both files, because + # one of the two compilations can be disabled. We should prefer + # $dir$base.o.d over $dir.libs/$base.o.d because the latter is +@@ -345,7 +416,7 @@ + + # Remove the call to Libtool. + if test "$libtool" = yes; then +- while test $1 != '--mode=compile'; do ++ while test "X$1" != 'X--mode=compile'; do + shift + done + shift +@@ -396,32 +467,39 @@ + "$@" || exit $? + # Remove any Libtool call + if test "$libtool" = yes; then +- while test $1 != '--mode=compile'; do ++ while test "X$1" != 'X--mode=compile'; do + shift + done + shift + fi + # X makedepend + shift +- cleared=no +- for arg in "$@"; do ++ cleared=no eat=no ++ for arg ++ do + case $cleared in + no) + set ""; shift + cleared=yes ;; + esac ++ if test $eat = yes; then ++ eat=no ++ continue ++ fi + case "$arg" in + -D*|-I*) + set fnord "$@" "$arg"; shift ;; + # Strip any option that makedepend may not understand. Remove + # the object too, otherwise makedepend will parse it as a source file. ++ -arch) ++ eat=yes ;; + -*|$object) + ;; + *) + set fnord "$@" "$arg"; shift ;; + esac + done +- obj_suffix="`echo $object | sed 's/^.*\././'`" ++ obj_suffix=`echo "$object" | sed 's/^.*\././'` + touch "$tmpdepfile" + ${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@" + rm -f "$depfile" +@@ -441,7 +519,7 @@ + + # Remove the call to Libtool. + if test "$libtool" = yes; then +- while test $1 != '--mode=compile'; do ++ while test "X$1" != 'X--mode=compile'; do + shift + done + shift +@@ -479,13 +557,27 @@ + + msvisualcpp) + # Important note: in order to support this mode, a compiler *must* +- # always write the preprocessed file to stdout, regardless of -o, +- # because we must use -o when running libtool. ++ # always write the preprocessed file to stdout. + "$@" || exit $? ++ ++ # Remove the call to Libtool. ++ if test "$libtool" = yes; then ++ while test "X$1" != 'X--mode=compile'; do ++ shift ++ done ++ shift ++ fi ++ + IFS=" " + for arg + do + case "$arg" in ++ -o) ++ shift ++ ;; ++ $object) ++ shift ++ ;; + "-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI") + set fnord "$@" + shift +@@ -498,16 +590,23 @@ + ;; + esac + done +- "$@" -E | +- sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::echo "`cygpath -u \\"\1\\"`":p' | sort | uniq > "$tmpdepfile" ++ "$@" -E 2>/dev/null | ++ sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::\1:p' | $cygpath_u | sort -u > "$tmpdepfile" + rm -f "$depfile" + echo "$object : \\" > "$depfile" +- . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s:: \1 \\:p' >> "$depfile" ++ sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s:: \1 \\:p' >> "$depfile" + echo " " >> "$depfile" +- . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s::\1\::p' >> "$depfile" ++ sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::\1\::p' >> "$depfile" + rm -f "$tmpdepfile" + ;; + ++msvcmsys) ++ # This case exists only to let depend.m4 do its work. It works by ++ # looking at the text of this script. This case will never be run, ++ # since it is checked for above. ++ exit 1 ++ ;; ++ + none) + exec "$@" + ;; +@@ -526,5 +625,6 @@ + # eval: (add-hook 'write-file-hooks 'time-stamp) + # time-stamp-start: "scriptversion=" + # time-stamp-format: "%:y-%02m-%02d.%02H" +-# time-stamp-end: "$" ++# time-stamp-time-zone: "UTC" ++# time-stamp-end: "; # UTC" + # End: +diff -Nur exmap-console-0.4.1.orig/doc/Makefile.in exmap-console-0.4.1/doc/Makefile.in +--- exmap-console-0.4.1.orig/doc/Makefile.in 2007-02-26 12:44:02.000000000 +0100 ++++ exmap-console-0.4.1/doc/Makefile.in 2011-01-11 12:44:16.000000000 +0100 +@@ -1,8 +1,9 @@ +-# Makefile.in generated by automake 1.9.6 from Makefile.am. ++# Makefile.in generated by automake 1.11.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, ++# Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -13,15 +14,12 @@ + # PARTICULAR PURPOSE. + + @SET_MAKE@ +-srcdir = @srcdir@ +-top_srcdir = @top_srcdir@ + VPATH = @srcdir@ + pkgdatadir = $(datadir)/@PACKAGE@ +-pkglibdir = $(libdir)/@PACKAGE@ + pkgincludedir = $(includedir)/@PACKAGE@ +-top_builddir = .. ++pkglibdir = $(libdir)/@PACKAGE@ ++pkglibexecdir = $(libexecdir)/@PACKAGE@ + am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +-INSTALL = @INSTALL@ + install_sh_DATA = $(install_sh) -c -m 644 + install_sh_PROGRAM = $(install_sh) -c + install_sh_SCRIPT = $(install_sh) -c +@@ -41,16 +39,36 @@ + $(ACLOCAL_M4) + mkinstalldirs = $(install_sh) -d + CONFIG_CLEAN_FILES = ++CONFIG_CLEAN_VPATH_FILES = + SOURCES = + DIST_SOURCES = ++am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; ++am__vpath_adj = case $$p in \ ++ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ ++ *) f=$$p;; \ ++ esac; ++am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; ++am__install_max = 40 ++am__nobase_strip_setup = \ ++ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` ++am__nobase_strip = \ ++ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" ++am__nobase_list = $(am__nobase_strip_setup); \ ++ for p in $$list; do echo "$$p $$p"; done | \ ++ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ ++ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ ++ if (++n[$$2] == $(am__install_max)) \ ++ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ ++ END { for (dir in files) print dir, files[dir] }' ++am__base_list = \ ++ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ ++ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' + man1dir = $(mandir)/man1 + am__installdirs = "$(DESTDIR)$(man1dir)" + NROFF = nroff + MANS = $(man_MANS) + DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + ACLOCAL = @ACLOCAL@ +-AMDEP_FALSE = @AMDEP_FALSE@ +-AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AUTOCONF = @AUTOCONF@ + AUTOHEADER = @AUTOHEADER@ +@@ -63,8 +81,6 @@ + CYGPATH_W = @CYGPATH_W@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ +-DODOCS_FALSE = @DODOCS_FALSE@ +-DODOCS_TRUE = @DODOCS_TRUE@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ +@@ -72,38 +88,41 @@ + GCC_CFLAGS = @GCC_CFLAGS@ + GLIB_CFLAGS = @GLIB_CFLAGS@ + GLIB_LIBS = @GLIB_LIBS@ +-HAVE_HELPTOMAN_FALSE = @HAVE_HELPTOMAN_FALSE@ +-HAVE_HELPTOMAN_TRUE = @HAVE_HELPTOMAN_TRUE@ + HELPTOMAN = @HELPTOMAN@ ++INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ + INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +-INTERACTIVE_FALSE = @INTERACTIVE_FALSE@ +-INTERACTIVE_TRUE = @INTERACTIVE_TRUE@ + LDFLAGS = @LDFLAGS@ + LIBOBJS = @LIBOBJS@ + LIBS = @LIBS@ + LTLIBOBJS = @LTLIBOBJS@ + MAKEINFO = @MAKEINFO@ ++MKDIR_P = @MKDIR_P@ + OBJEXT = @OBJEXT@ + PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ ++PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PKG_CONFIG = @PKG_CONFIG@ ++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ ++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ + READLINE_CFLAGS = @READLINE_CFLAGS@ + READLINE_LIBS = @READLINE_LIBS@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + STRIP = @STRIP@ + VERSION = @VERSION@ ++abs_builddir = @abs_builddir@ ++abs_srcdir = @abs_srcdir@ ++abs_top_builddir = @abs_top_builddir@ ++abs_top_srcdir = @abs_top_srcdir@ + ac_ct_CC = @ac_ct_CC@ +-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ +-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ + am__include = @am__include@ + am__leading_dot = @am__leading_dot@ + am__quote = @am__quote@ +@@ -111,6 +130,7 @@ + am__untar = @am__untar@ + bindir = @bindir@ + build_alias = @build_alias@ ++builddir = @builddir@ + datadir = @datadir@ + datarootdir = @datarootdir@ + docdir = @docdir@ +@@ -134,8 +154,12 @@ + psdir = @psdir@ + sbindir = @sbindir@ + sharedstatedir = @sharedstatedir@ ++srcdir = @srcdir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ ++top_build_prefix = @top_build_prefix@ ++top_builddir = @top_builddir@ ++top_srcdir = @top_srcdir@ + DISTCLEANFILES = *~ Makefile.in + @DODOCS_TRUE@@INTERACTIVE_TRUE@interactive = exmapserver.1 + @DODOCS_TRUE@man_MANS = exmap.1 exmapd.1 $(interactive) +@@ -146,14 +170,14 @@ + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ ++ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ ++ && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/Makefile'; \ +- cd $(top_srcdir) && \ +- $(AUTOMAKE) --gnu doc/Makefile ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/Makefile'; \ ++ $(am__cd) $(top_srcdir) && \ ++ $(AUTOMAKE) --gnu doc/Makefile + .PRECIOUS: Makefile + Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ +@@ -171,52 +195,45 @@ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + $(ACLOCAL_M4): $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-uninstall-info-am: +-install-man1: $(man1_MANS) $(man_MANS) ++$(am__aclocal_m4_deps): ++install-man1: $(man_MANS) + @$(NORMAL_INSTALL) +- test -z "$(man1dir)" || $(mkdir_p) "$(DESTDIR)$(man1dir)" +- @list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \ +- l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \ +- for i in $$l2; do \ +- case "$$i" in \ +- *.1*) list="$$list $$i" ;; \ +- esac; \ ++ test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)" ++ @list=''; test -n "$(man1dir)" || exit 0; \ ++ { for i in $$list; do echo "$$i"; done; \ ++ l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \ ++ sed -n '/\.1[a-z]*$$/p'; \ ++ } | while read p; do \ ++ if test -f $$p; then d=; else d="$(srcdir)/"; fi; \ ++ echo "$$d$$p"; echo "$$p"; \ ++ done | \ ++ sed -e 'n;s,.*/,,;p;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \ ++ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,' | \ ++ sed 'N;N;s,\n, ,g' | { \ ++ list=; while read file base inst; do \ ++ if test "$$base" = "$$inst"; then list="$$list $$file"; else \ ++ echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man1dir)/$$inst'"; \ ++ $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man1dir)/$$inst" || exit $$?; \ ++ fi; \ + done; \ +- for i in $$list; do \ +- if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \ +- else file=$$i; fi; \ +- ext=`echo $$i | sed -e 's/^.*\\.//'`; \ +- case "$$ext" in \ +- 1*) ;; \ +- *) ext='1' ;; \ +- esac; \ +- inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ +- inst=`echo $$inst | sed -e 's/^.*\///'`; \ +- inst=`echo $$inst | sed '$(transform)'`.$$ext; \ +- echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man1dir)/$$inst'"; \ +- $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man1dir)/$$inst"; \ +- done ++ for i in $$list; do echo "$$i"; done | $(am__base_list) | \ ++ while read files; do \ ++ test -z "$$files" || { \ ++ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(man1dir)'"; \ ++ $(INSTALL_DATA) $$files "$(DESTDIR)$(man1dir)" || exit $$?; }; \ ++ done; } ++ + uninstall-man1: + @$(NORMAL_UNINSTALL) +- @list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \ +- l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \ +- for i in $$l2; do \ +- case "$$i" in \ +- *.1*) list="$$list $$i" ;; \ +- esac; \ +- done; \ +- for i in $$list; do \ +- ext=`echo $$i | sed -e 's/^.*\\.//'`; \ +- case "$$ext" in \ +- 1*) ;; \ +- *) ext='1' ;; \ +- esac; \ +- inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ +- inst=`echo $$inst | sed -e 's/^.*\///'`; \ +- inst=`echo $$inst | sed '$(transform)'`.$$ext; \ +- echo " rm -f '$(DESTDIR)$(man1dir)/$$inst'"; \ +- rm -f "$(DESTDIR)$(man1dir)/$$inst"; \ +- done ++ @list=''; test -n "$(man1dir)" || exit 0; \ ++ files=`{ for i in $$list; do echo "$$i"; done; \ ++ l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \ ++ sed -n '/\.1[a-z]*$$/p'; \ ++ } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \ ++ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \ ++ test -z "$$files" || { \ ++ echo " ( cd '$(DESTDIR)$(man1dir)' && rm -f" $$files ")"; \ ++ cd "$(DESTDIR)$(man1dir)" && rm -f $$files; } + tags: TAGS + TAGS: + +@@ -225,29 +242,45 @@ + + + distdir: $(DISTFILES) +- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ +- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ +- list='$(DISTFILES)'; for file in $$list; do \ +- case $$file in \ +- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ +- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ +- esac; \ ++ @list='$(MANS)'; if test -n "$$list"; then \ ++ list=`for p in $$list; do \ ++ if test -f $$p; then d=; else d="$(srcdir)/"; fi; \ ++ if test -f "$$d$$p"; then echo "$$d$$p"; else :; fi; done`; \ ++ if test -n "$$list" && \ ++ grep 'ab help2man is required to generate this page' $$list >/dev/null; then \ ++ echo "error: found man pages containing the \`missing help2man' replacement text:" >&2; \ ++ grep -l 'ab help2man is required to generate this page' $$list | sed 's/^/ /' >&2; \ ++ echo " to fix them, install help2man, remove and regenerate the man pages;" >&2; \ ++ echo " typically \`make maintainer-clean' will remove them" >&2; \ ++ exit 1; \ ++ else :; fi; \ ++ else :; fi ++ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ list='$(DISTFILES)'; \ ++ dist_files=`for file in $$list; do echo $$file; done | \ ++ sed -e "s|^$$srcdirstrip/||;t" \ ++ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ ++ case $$dist_files in \ ++ */*) $(MKDIR_P) `echo "$$dist_files" | \ ++ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ ++ sort -u` ;; \ ++ esac; \ ++ for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ +- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ +- if test "$$dir" != "$$file" && test "$$dir" != "."; then \ +- dir="/$$dir"; \ +- $(mkdir_p) "$(distdir)$$dir"; \ +- else \ +- dir=''; \ +- fi; \ + if test -d $$d/$$file; then \ ++ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ ++ if test -d "$(distdir)/$$file"; then \ ++ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ ++ fi; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ +- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ ++ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ ++ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ +- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ ++ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ + else \ +- test -f $(distdir)/$$file \ +- || cp -p $$d/$$file $(distdir)/$$file \ ++ test -f "$(distdir)/$$file" \ ++ || cp -p $$d/$$file "$(distdir)/$$file" \ + || exit 1; \ + fi; \ + done +@@ -256,7 +289,7 @@ + all-am: Makefile $(MANS) + installdirs: + for dir in "$(DESTDIR)$(man1dir)"; do \ +- test -z "$$dir" || $(mkdir_p) "$$dir"; \ ++ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ + done + install: install-am + install-exec: install-exec-am +@@ -278,6 +311,7 @@ + + distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) + -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES) + + maintainer-clean-generic: +@@ -297,18 +331,38 @@ + + html: html-am + ++html-am: ++ + info: info-am + + info-am: + + install-data-am: install-man + ++install-dvi: install-dvi-am ++ ++install-dvi-am: ++ + install-exec-am: + ++install-html: install-html-am ++ ++install-html-am: ++ + install-info: install-info-am + ++install-info-am: ++ + install-man: install-man1 + ++install-pdf: install-pdf-am ++ ++install-pdf-am: ++ ++install-ps: install-ps-am ++ ++install-ps-am: ++ + installcheck-am: + + maintainer-clean: maintainer-clean-am +@@ -327,18 +381,22 @@ + + ps-am: + +-uninstall-am: uninstall-info-am uninstall-man ++uninstall-am: uninstall-man + + uninstall-man: uninstall-man1 + ++.MAKE: install-am install-strip ++ + .PHONY: all all-am check check-am clean clean-generic distclean \ + distclean-generic distdir dvi dvi-am html html-am info info-am \ +- install install-am install-data install-data-am install-exec \ +- install-exec-am install-info install-info-am install-man \ +- install-man1 install-strip installcheck installcheck-am \ ++ install install-am install-data install-data-am install-dvi \ ++ install-dvi-am install-exec install-exec-am install-html \ ++ install-html-am install-info install-info-am install-man \ ++ install-man1 install-pdf install-pdf-am install-ps \ ++ install-ps-am install-strip installcheck installcheck-am \ + installdirs maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \ +- uninstall-am uninstall-info-am uninstall-man uninstall-man1 ++ uninstall-am uninstall-man uninstall-man1 + + + @DODOCS_TRUE@@HAVE_HELPTOMAN_TRUE@exmap.1: ../src/exmap ./man.include +@@ -349,6 +407,7 @@ + + @DODOCS_TRUE@@HAVE_HELPTOMAN_TRUE@@INTERACTIVE_TRUE@exmapserver.1: ../src/exmapserver ./man-s.include + @DODOCS_TRUE@@HAVE_HELPTOMAN_TRUE@@INTERACTIVE_TRUE@ $(HELPTOMAN) -N -I ./man-s.include -m "Exmap server" ../src/exmapserver > ./exmapserver.1 ++ + # Tell versions [3.59,3.63) of GNU make to not export all variables. + # Otherwise a system limit (for SysV at least) may be exceeded. + .NOEXPORT: +diff -Nur exmap-console-0.4.1.orig/install-sh exmap-console-0.4.1/install-sh +--- exmap-console-0.4.1.orig/install-sh 2007-02-26 12:44:02.000000000 +0100 ++++ exmap-console-0.4.1/install-sh 2011-01-11 12:44:16.000000000 +0100 +@@ -1,7 +1,7 @@ + #!/bin/sh + # install - install a program, script, or datafile + +-scriptversion=2005-05-14.22 ++scriptversion=2009-04-28.21; # UTC + + # This originates from X11R5 (mit/util/scripts/install.sh), which was + # later released in X11R6 (xc/config/util/install.sh) with the +@@ -39,38 +39,68 @@ + # when there is no Makefile. + # + # This script is compatible with the BSD install script, but was written +-# from scratch. It can only install one file at a time, a restriction +-# shared with many OS's install programs. ++# from scratch. ++ ++nl=' ++' ++IFS=" "" $nl" + + # set DOITPROG to echo to test this script + + # Don't use :- since 4.3BSD and earlier shells don't like it. +-doit="${DOITPROG-}" ++doit=${DOITPROG-} ++if test -z "$doit"; then ++ doit_exec=exec ++else ++ doit_exec=$doit ++fi + +-# put in absolute paths if you don't have them in your path; or use env. vars. ++# Put in absolute file names if you don't have them in your path; ++# or use environment vars. + +-mvprog="${MVPROG-mv}" +-cpprog="${CPPROG-cp}" +-chmodprog="${CHMODPROG-chmod}" +-chownprog="${CHOWNPROG-chown}" +-chgrpprog="${CHGRPPROG-chgrp}" +-stripprog="${STRIPPROG-strip}" +-rmprog="${RMPROG-rm}" +-mkdirprog="${MKDIRPROG-mkdir}" ++chgrpprog=${CHGRPPROG-chgrp} ++chmodprog=${CHMODPROG-chmod} ++chownprog=${CHOWNPROG-chown} ++cmpprog=${CMPPROG-cmp} ++cpprog=${CPPROG-cp} ++mkdirprog=${MKDIRPROG-mkdir} ++mvprog=${MVPROG-mv} ++rmprog=${RMPROG-rm} ++stripprog=${STRIPPROG-strip} ++ ++posix_glob='?' ++initialize_posix_glob=' ++ test "$posix_glob" != "?" || { ++ if (set -f) 2>/dev/null; then ++ posix_glob= ++ else ++ posix_glob=: ++ fi ++ } ++' ++ ++posix_mkdir= ++ ++# Desired mode of installed file. ++mode=0755 + +-chmodcmd="$chmodprog 0755" +-chowncmd= + chgrpcmd= +-stripcmd= ++chmodcmd=$chmodprog ++chowncmd= ++mvcmd=$mvprog + rmcmd="$rmprog -f" +-mvcmd="$mvprog" ++stripcmd= ++ + src= + dst= + dir_arg= +-dstarg= ++dst_arg= ++ ++copy_on_change=false + no_target_directory= + +-usage="Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE ++usage="\ ++Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE + or: $0 [OPTION]... SRCFILES... DIRECTORY + or: $0 [OPTION]... -t DIRECTORY SRCFILES... + or: $0 [OPTION]... -d DIRECTORIES... +@@ -80,81 +110,86 @@ + In the 4th, create DIRECTORIES. + + Options: +--c (ignored) +--d create directories instead of installing files. +--g GROUP $chgrpprog installed files to GROUP. +--m MODE $chmodprog installed files to MODE. +--o USER $chownprog installed files to USER. +--s $stripprog installed files. +--t DIRECTORY install into DIRECTORY. +--T report an error if DSTFILE is a directory. +---help display this help and exit. +---version display version info and exit. ++ --help display this help and exit. ++ --version display version info and exit. ++ ++ -c (ignored) ++ -C install only if different (preserve the last data modification time) ++ -d create directories instead of installing files. ++ -g GROUP $chgrpprog installed files to GROUP. ++ -m MODE $chmodprog installed files to MODE. ++ -o USER $chownprog installed files to USER. ++ -s $stripprog installed files. ++ -t DIRECTORY install into DIRECTORY. ++ -T report an error if DSTFILE is a directory. + + Environment variables override the default commands: +- CHGRPPROG CHMODPROG CHOWNPROG CPPROG MKDIRPROG MVPROG RMPROG STRIPPROG ++ CHGRPPROG CHMODPROG CHOWNPROG CMPPROG CPPROG MKDIRPROG MVPROG ++ RMPROG STRIPPROG + " + +-while test -n "$1"; do ++while test $# -ne 0; do + case $1 in +- -c) shift +- continue;; ++ -c) ;; + +- -d) dir_arg=true +- shift +- continue;; ++ -C) copy_on_change=true;; ++ ++ -d) dir_arg=true;; + + -g) chgrpcmd="$chgrpprog $2" +- shift +- shift +- continue;; ++ shift;; + + --help) echo "$usage"; exit $?;; + +- -m) chmodcmd="$chmodprog $2" +- shift +- shift +- continue;; ++ -m) mode=$2 ++ case $mode in ++ *' '* | *' '* | *' ++'* | *'*'* | *'?'* | *'['*) ++ echo "$0: invalid mode: $mode" >&2 ++ exit 1;; ++ esac ++ shift;; + + -o) chowncmd="$chownprog $2" +- shift +- shift +- continue;; +- +- -s) stripcmd=$stripprog +- shift +- continue;; +- +- -t) dstarg=$2 +- shift +- shift +- continue;; +- +- -T) no_target_directory=true +- shift +- continue;; ++ shift;; ++ ++ -s) stripcmd=$stripprog;; ++ ++ -t) dst_arg=$2 ++ shift;; ++ ++ -T) no_target_directory=true;; + + --version) echo "$0 $scriptversion"; exit $?;; + +- *) # When -d is used, all remaining arguments are directories to create. +- # When -t is used, the destination is already specified. +- test -n "$dir_arg$dstarg" && break +- # Otherwise, the last argument is the destination. Remove it from $@. +- for arg +- do +- if test -n "$dstarg"; then +- # $@ is not empty: it contains at least $arg. +- set fnord "$@" "$dstarg" +- shift # fnord +- fi +- shift # arg +- dstarg=$arg +- done ++ --) shift + break;; ++ ++ -*) echo "$0: invalid option: $1" >&2 ++ exit 1;; ++ ++ *) break;; + esac ++ shift + done + +-if test -z "$1"; then ++if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then ++ # When -d is used, all remaining arguments are directories to create. ++ # When -t is used, the destination is already specified. ++ # Otherwise, the last argument is the destination. Remove it from $@. ++ for arg ++ do ++ if test -n "$dst_arg"; then ++ # $@ is not empty: it contains at least $arg. ++ set fnord "$@" "$dst_arg" ++ shift # fnord ++ fi ++ shift # arg ++ dst_arg=$arg ++ done ++fi ++ ++if test $# -eq 0; then + if test -z "$dir_arg"; then + echo "$0: no input file specified." >&2 + exit 1 +@@ -164,24 +199,47 @@ + exit 0 + fi + ++if test -z "$dir_arg"; then ++ trap '(exit $?); exit' 1 2 13 15 ++ ++ # Set umask so as not to create temps with too-generous modes. ++ # However, 'strip' requires both read and write access to temps. ++ case $mode in ++ # Optimize common cases. ++ *644) cp_umask=133;; ++ *755) cp_umask=22;; ++ ++ *[0-7]) ++ if test -z "$stripcmd"; then ++ u_plus_rw= ++ else ++ u_plus_rw='% 200' ++ fi ++ cp_umask=`expr '(' 777 - $mode % 1000 ')' $u_plus_rw`;; ++ *) ++ if test -z "$stripcmd"; then ++ u_plus_rw= ++ else ++ u_plus_rw=,u+rw ++ fi ++ cp_umask=$mode$u_plus_rw;; ++ esac ++fi ++ + for src + do + # Protect names starting with `-'. + case $src in +- -*) src=./$src ;; ++ -*) src=./$src;; + esac + + if test -n "$dir_arg"; then + dst=$src +- src= +- +- if test -d "$dst"; then +- mkdircmd=: +- chmodcmd= +- else +- mkdircmd=$mkdirprog +- fi ++ dstdir=$dst ++ test -d "$dstdir" ++ dstdir_status=$? + else ++ + # Waiting for this to be detected by the "$cpprog $src $dsttmp" command + # might cause directories to be created, which would be especially bad + # if $src (and thus $dsttmp) contains '*'. +@@ -190,71 +248,199 @@ + exit 1 + fi + +- if test -z "$dstarg"; then ++ if test -z "$dst_arg"; then + echo "$0: no destination specified." >&2 + exit 1 + fi + +- dst=$dstarg ++ dst=$dst_arg + # Protect names starting with `-'. + case $dst in +- -*) dst=./$dst ;; ++ -*) dst=./$dst;; + esac + + # If destination is a directory, append the input filename; won't work + # if double slashes aren't ignored. + if test -d "$dst"; then + if test -n "$no_target_directory"; then +- echo "$0: $dstarg: Is a directory" >&2 ++ echo "$0: $dst_arg: Is a directory" >&2 + exit 1 + fi +- dst=$dst/`basename "$src"` ++ dstdir=$dst ++ dst=$dstdir/`basename "$src"` ++ dstdir_status=0 ++ else ++ # Prefer dirname, but fall back on a substitute if dirname fails. ++ dstdir=` ++ (dirname "$dst") 2>/dev/null || ++ expr X"$dst" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ ++ X"$dst" : 'X\(//\)[^/]' \| \ ++ X"$dst" : 'X\(//\)$' \| \ ++ X"$dst" : 'X\(/\)' \| . 2>/dev/null || ++ echo X"$dst" | ++ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ ++ s//\1/ ++ q ++ } ++ /^X\(\/\/\)[^/].*/{ ++ s//\1/ ++ q ++ } ++ /^X\(\/\/\)$/{ ++ s//\1/ ++ q ++ } ++ /^X\(\/\).*/{ ++ s//\1/ ++ q ++ } ++ s/.*/./; q' ++ ` ++ ++ test -d "$dstdir" ++ dstdir_status=$? + fi + fi + +- # This sed command emulates the dirname command. +- dstdir=`echo "$dst" | sed -e 's,/*$,,;s,[^/]*$,,;s,/*$,,;s,^$,.,'` +- +- # Make sure that the destination directory exists. ++ obsolete_mkdir_used=false + +- # Skip lots of stat calls in the usual case. +- if test ! -d "$dstdir"; then +- defaultIFS=' +- ' +- IFS="${IFS-$defaultIFS}" +- +- oIFS=$IFS +- # Some sh's can't handle IFS=/ for some reason. +- IFS='%' +- set x `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'` +- shift +- IFS=$oIFS ++ if test $dstdir_status != 0; then ++ case $posix_mkdir in ++ '') ++ # Create intermediate dirs using mode 755 as modified by the umask. ++ # This is like FreeBSD 'install' as of 1997-10-28. ++ umask=`umask` ++ case $stripcmd.$umask in ++ # Optimize common cases. ++ *[2367][2367]) mkdir_umask=$umask;; ++ .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;; ++ ++ *[0-7]) ++ mkdir_umask=`expr $umask + 22 \ ++ - $umask % 100 % 40 + $umask % 20 \ ++ - $umask % 10 % 4 + $umask % 2 ++ `;; ++ *) mkdir_umask=$umask,go-w;; ++ esac ++ ++ # With -d, create the new directory with the user-specified mode. ++ # Otherwise, rely on $mkdir_umask. ++ if test -n "$dir_arg"; then ++ mkdir_mode=-m$mode ++ else ++ mkdir_mode= ++ fi ++ ++ posix_mkdir=false ++ case $umask in ++ *[123567][0-7][0-7]) ++ # POSIX mkdir -p sets u+wx bits regardless of umask, which ++ # is incompatible with FreeBSD 'install' when (umask & 300) != 0. ++ ;; ++ *) ++ tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$ ++ trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0 ++ ++ if (umask $mkdir_umask && ++ exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1 ++ then ++ if test -z "$dir_arg" || { ++ # Check for POSIX incompatibilities with -m. ++ # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or ++ # other-writeable bit of parent directory when it shouldn't. ++ # FreeBSD 6.1 mkdir -m -p sets mode of existing directory. ++ ls_ld_tmpdir=`ls -ld "$tmpdir"` ++ case $ls_ld_tmpdir in ++ d????-?r-*) different_mode=700;; ++ d????-?--*) different_mode=755;; ++ *) false;; ++ esac && ++ $mkdirprog -m$different_mode -p -- "$tmpdir" && { ++ ls_ld_tmpdir_1=`ls -ld "$tmpdir"` ++ test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1" ++ } ++ } ++ then posix_mkdir=: ++ fi ++ rmdir "$tmpdir/d" "$tmpdir" ++ else ++ # Remove any dirs left behind by ancient mkdir implementations. ++ rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null ++ fi ++ trap '' 0;; ++ esac;; ++ esac + +- pathcomp= ++ if ++ $posix_mkdir && ( ++ umask $mkdir_umask && ++ $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir" ++ ) ++ then : ++ else + +- while test $# -ne 0 ; do +- pathcomp=$pathcomp$1 ++ # The umask is ridiculous, or mkdir does not conform to POSIX, ++ # or it failed possibly due to a race condition. Create the ++ # directory the slow way, step by step, checking for races as we go. ++ ++ case $dstdir in ++ /*) prefix='/';; ++ -*) prefix='./';; ++ *) prefix='';; ++ esac ++ ++ eval "$initialize_posix_glob" ++ ++ oIFS=$IFS ++ IFS=/ ++ $posix_glob set -f ++ set fnord $dstdir + shift +- if test ! -d "$pathcomp"; then +- $mkdirprog "$pathcomp" +- # mkdir can fail with a `File exist' error in case several +- # install-sh are creating the directory concurrently. This +- # is OK. +- test -d "$pathcomp" || exit ++ $posix_glob set +f ++ IFS=$oIFS ++ ++ prefixes= ++ ++ for d ++ do ++ test -z "$d" && continue ++ ++ prefix=$prefix$d ++ if test -d "$prefix"; then ++ prefixes= ++ else ++ if $posix_mkdir; then ++ (umask=$mkdir_umask && ++ $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break ++ # Don't fail if two instances are running concurrently. ++ test -d "$prefix" || exit 1 ++ else ++ case $prefix in ++ *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;; ++ *) qprefix=$prefix;; ++ esac ++ prefixes="$prefixes '$qprefix'" ++ fi ++ fi ++ prefix=$prefix/ ++ done ++ ++ if test -n "$prefixes"; then ++ # Don't fail if two instances are running concurrently. ++ (umask $mkdir_umask && ++ eval "\$doit_exec \$mkdirprog $prefixes") || ++ test -d "$dstdir" || exit 1 ++ obsolete_mkdir_used=true + fi +- pathcomp=$pathcomp/ +- done ++ fi + fi + + if test -n "$dir_arg"; then +- $doit $mkdircmd "$dst" \ +- && { test -z "$chowncmd" || $doit $chowncmd "$dst"; } \ +- && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } \ +- && { test -z "$stripcmd" || $doit $stripcmd "$dst"; } \ +- && { test -z "$chmodcmd" || $doit $chmodcmd "$dst"; } +- ++ { test -z "$chowncmd" || $doit $chowncmd "$dst"; } && ++ { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } && ++ { test "$obsolete_mkdir_used$chowncmd$chgrpcmd" = false || ++ test -z "$chmodcmd" || $doit $chmodcmd $mode "$dst"; } || exit 1 + else +- dstfile=`basename "$dst"` + + # Make a couple of temp file names in the proper directory. + dsttmp=$dstdir/_inst.$$_ +@@ -262,10 +448,9 @@ + + # Trap to clean up those temp files at exit. + trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0 +- trap '(exit $?); exit' 1 2 13 15 + + # Copy the file name to the temp name. +- $doit $cpprog "$src" "$dsttmp" && ++ (umask $cp_umask && $doit_exec $cpprog "$src" "$dsttmp") && + + # and set any options; do chmod last to preserve setuid bits. + # +@@ -273,51 +458,63 @@ + # ignore errors from any of these, just make sure not to ignore + # errors from the above "$doit $cpprog $src $dsttmp" command. + # +- { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } \ +- && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } \ +- && { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } \ +- && { test -z "$chmodcmd" || $doit $chmodcmd "$dsttmp"; } && +- +- # Now rename the file to the real destination. +- { $doit $mvcmd -f "$dsttmp" "$dstdir/$dstfile" 2>/dev/null \ +- || { +- # The rename failed, perhaps because mv can't rename something else +- # to itself, or perhaps because mv is so ancient that it does not +- # support -f. +- +- # Now remove or move aside any old file at destination location. +- # We try this two ways since rm can't unlink itself on some +- # systems and the destination file might be busy for other +- # reasons. In this case, the final cleanup might fail but the new +- # file should still install successfully. +- { +- if test -f "$dstdir/$dstfile"; then +- $doit $rmcmd -f "$dstdir/$dstfile" 2>/dev/null \ +- || $doit $mvcmd -f "$dstdir/$dstfile" "$rmtmp" 2>/dev/null \ +- || { +- echo "$0: cannot unlink or rename $dstdir/$dstfile" >&2 +- (exit 1); exit 1 +- } +- else +- : +- fi +- } && +- +- # Now rename the file to the real destination. +- $doit $mvcmd "$dsttmp" "$dstdir/$dstfile" +- } +- } +- fi || { (exit 1); exit 1; } +-done ++ { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } && ++ { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } && ++ { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } && ++ { test -z "$chmodcmd" || $doit $chmodcmd $mode "$dsttmp"; } && ++ ++ # If -C, don't bother to copy if it wouldn't change the file. ++ if $copy_on_change && ++ old=`LC_ALL=C ls -dlL "$dst" 2>/dev/null` && ++ new=`LC_ALL=C ls -dlL "$dsttmp" 2>/dev/null` && ++ ++ eval "$initialize_posix_glob" && ++ $posix_glob set -f && ++ set X $old && old=:$2:$4:$5:$6 && ++ set X $new && new=:$2:$4:$5:$6 && ++ $posix_glob set +f && ++ ++ test "$old" = "$new" && ++ $cmpprog "$dst" "$dsttmp" >/dev/null 2>&1 ++ then ++ rm -f "$dsttmp" ++ else ++ # Rename the file to the real destination. ++ $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null || + +-# The final little trick to "correctly" pass the exit status to the exit trap. +-{ +- (exit 0); exit 0 +-} ++ # The rename failed, perhaps because mv can't rename something else ++ # to itself, or perhaps because mv is so ancient that it does not ++ # support -f. ++ { ++ # Now remove or move aside any old file at destination location. ++ # We try this two ways since rm can't unlink itself on some ++ # systems and the destination file might be busy for other ++ # reasons. In this case, the final cleanup might fail but the new ++ # file should still install successfully. ++ { ++ test ! -f "$dst" || ++ $doit $rmcmd -f "$dst" 2>/dev/null || ++ { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null && ++ { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; } ++ } || ++ { echo "$0: cannot unlink or rename $dst" >&2 ++ (exit 1); exit 1 ++ } ++ } && ++ ++ # Now rename the file to the real destination. ++ $doit $mvcmd "$dsttmp" "$dst" ++ } ++ fi || exit 1 ++ ++ trap '' 0 ++ fi ++done + + # Local variables: + # eval: (add-hook 'write-file-hooks 'time-stamp) + # time-stamp-start: "scriptversion=" + # time-stamp-format: "%:y-%02m-%02d.%02H" +-# time-stamp-end: "$" ++# time-stamp-time-zone: "UTC" ++# time-stamp-end: "; # UTC" + # End: +diff -Nur exmap-console-0.4.1.orig/missing exmap-console-0.4.1/missing +--- exmap-console-0.4.1.orig/missing 2007-02-26 12:44:02.000000000 +0100 ++++ exmap-console-0.4.1/missing 2011-01-11 12:44:16.000000000 +0100 +@@ -1,10 +1,10 @@ + #! /bin/sh + # Common stub for a few missing GNU programs while installing. + +-scriptversion=2005-06-08.21 ++scriptversion=2009-04-28.21; # UTC + +-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005 +-# Free Software Foundation, Inc. ++# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006, ++# 2008, 2009 Free Software Foundation, Inc. + # Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996. + + # This program is free software; you can redistribute it and/or modify +@@ -18,9 +18,7 @@ + # GNU General Public License for more details. + + # You should have received a copy of the GNU General Public License +-# along with this program; if not, write to the Free Software +-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA +-# 02110-1301, USA. ++# along with this program. If not, see <http://www.gnu.org/licenses/>. + + # As a special exception to the GNU General Public License, if you + # distribute this file as part of a program that contains a +@@ -33,6 +31,8 @@ + fi + + run=: ++sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p' ++sed_minuso='s/.* -o \([^ ]*\).*/\1/p' + + # In the cases where this matters, `missing' is being run in the + # srcdir already. +@@ -44,7 +44,7 @@ + + msg="missing on your system" + +-case "$1" in ++case $1 in + --run) + # Try to run requested program, and just exit if it succeeds. + run= +@@ -77,6 +77,7 @@ + aclocal touch file \`aclocal.m4' + autoconf touch file \`configure' + autoheader touch file \`config.h.in' ++ autom4te touch the output file, or create a stub one + automake touch all \`Makefile.in' files + bison create \`y.tab.[ch]', if possible, from existing .[ch] + flex create \`lex.yy.c', if possible, from existing .c +@@ -86,6 +87,9 @@ + tar try tar, gnutar, gtar, then tar without non-portable flags + yacc create \`y.tab.[ch]', if possible, from existing .[ch] + ++Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and ++\`g' are ignored when checking the name. ++ + Send bug reports to <bug-automake@gnu.org>." + exit $? + ;; +@@ -103,15 +107,22 @@ + + esac + ++# normalize program name to check for. ++program=`echo "$1" | sed ' ++ s/^gnu-//; t ++ s/^gnu//; t ++ s/^g//; t'` ++ + # Now exit if we have it, but it failed. Also exit now if we + # don't have it and --version was passed (most likely to detect +-# the program). +-case "$1" in +- lex|yacc) ++# the program). This is about non-GNU programs, so use $1 not ++# $program. ++case $1 in ++ lex*|yacc*) + # Not GNU programs, they don't have --version. + ;; + +- tar) ++ tar*) + if test -n "$run"; then + echo 1>&2 "ERROR: \`tar' requires --run" + exit 1 +@@ -135,7 +146,7 @@ + + # If it does not exist, or fails to run (possibly an outdated version), + # try to emulate it. +-case "$1" in ++case $program in + aclocal*) + echo 1>&2 "\ + WARNING: \`$1' is $msg. You should only need it if +@@ -145,7 +156,7 @@ + touch aclocal.m4 + ;; + +- autoconf) ++ autoconf*) + echo 1>&2 "\ + WARNING: \`$1' is $msg. You should only need it if + you modified \`${configure_ac}'. You might want to install the +@@ -154,7 +165,7 @@ + touch configure + ;; + +- autoheader) ++ autoheader*) + echo 1>&2 "\ + WARNING: \`$1' is $msg. You should only need it if + you modified \`acconfig.h' or \`${configure_ac}'. You might want +@@ -164,7 +175,7 @@ + test -z "$files" && files="config.h" + touch_files= + for f in $files; do +- case "$f" in ++ case $f in + *:*) touch_files="$touch_files "`echo "$f" | + sed -e 's/^[^:]*://' -e 's/:.*//'`;; + *) touch_files="$touch_files $f.in";; +@@ -184,7 +195,7 @@ + while read f; do touch "$f"; done + ;; + +- autom4te) ++ autom4te*) + echo 1>&2 "\ + WARNING: \`$1' is needed, but is $msg. + You might have modified some files without having the +@@ -192,8 +203,8 @@ + You can get \`$1' as part of \`Autoconf' from any GNU + archive site." + +- file=`echo "$*" | sed -n 's/.*--output[ =]*\([^ ]*\).*/\1/p'` +- test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*\([^ ]*\).*/\1/p'` ++ file=`echo "$*" | sed -n "$sed_output"` ++ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` + if test -f "$file"; then + touch $file + else +@@ -207,80 +218,78 @@ + fi + ;; + +- bison|yacc) ++ bison*|yacc*) + echo 1>&2 "\ + WARNING: \`$1' $msg. You should only need it if + you modified a \`.y' file. You may need the \`Bison' package + in order for those modifications to take effect. You can get + \`Bison' from any GNU archive site." + rm -f y.tab.c y.tab.h +- if [ $# -ne 1 ]; then ++ if test $# -ne 1; then + eval LASTARG="\${$#}" +- case "$LASTARG" in ++ case $LASTARG in + *.y) + SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'` +- if [ -f "$SRCFILE" ]; then ++ if test -f "$SRCFILE"; then + cp "$SRCFILE" y.tab.c + fi + SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'` +- if [ -f "$SRCFILE" ]; then ++ if test -f "$SRCFILE"; then + cp "$SRCFILE" y.tab.h + fi + ;; + esac + fi +- if [ ! -f y.tab.h ]; then ++ if test ! -f y.tab.h; then + echo >y.tab.h + fi +- if [ ! -f y.tab.c ]; then ++ if test ! -f y.tab.c; then + echo 'main() { return 0; }' >y.tab.c + fi + ;; + +- lex|flex) ++ lex*|flex*) + echo 1>&2 "\ + WARNING: \`$1' is $msg. You should only need it if + you modified a \`.l' file. You may need the \`Flex' package + in order for those modifications to take effect. You can get + \`Flex' from any GNU archive site." + rm -f lex.yy.c +- if [ $# -ne 1 ]; then ++ if test $# -ne 1; then + eval LASTARG="\${$#}" +- case "$LASTARG" in ++ case $LASTARG in + *.l) + SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'` +- if [ -f "$SRCFILE" ]; then ++ if test -f "$SRCFILE"; then + cp "$SRCFILE" lex.yy.c + fi + ;; + esac + fi +- if [ ! -f lex.yy.c ]; then ++ if test ! -f lex.yy.c; then + echo 'main() { return 0; }' >lex.yy.c + fi + ;; + +- help2man) ++ help2man*) + echo 1>&2 "\ + WARNING: \`$1' is $msg. You should only need it if + you modified a dependency of a manual page. You may need the + \`Help2man' package in order for those modifications to take + effect. You can get \`Help2man' from any GNU archive site." + +- file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'` +- if test -z "$file"; then +- file=`echo "$*" | sed -n 's/.*--output=\([^ ]*\).*/\1/p'` +- fi +- if [ -f "$file" ]; then ++ file=`echo "$*" | sed -n "$sed_output"` ++ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` ++ if test -f "$file"; then + touch $file + else + test -z "$file" || exec >$file + echo ".ab help2man is required to generate this page" +- exit 1 ++ exit $? + fi + ;; + +- makeinfo) ++ makeinfo*) + echo 1>&2 "\ + WARNING: \`$1' is $msg. You should only need it if + you modified a \`.texi' or \`.texinfo' file, or any other file +@@ -289,11 +298,17 @@ + DU, IRIX). You might want to install the \`Texinfo' package or + the \`GNU make' package. Grab either from any GNU archive site." + # The file to touch is that specified with -o ... +- file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'` ++ file=`echo "$*" | sed -n "$sed_output"` ++ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` + if test -z "$file"; then + # ... or it is the one specified with @setfilename ... + infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'` +- file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $infile` ++ file=`sed -n ' ++ /^@setfilename/{ ++ s/.* \([^ ]*\) *$/\1/ ++ p ++ q ++ }' $infile` + # ... or it is derived from the source name (dir/f.texi becomes f.info) + test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info + fi +@@ -303,7 +318,7 @@ + touch $file + ;; + +- tar) ++ tar*) + shift + + # We have already tried tar in the generic part. +@@ -317,13 +332,13 @@ + fi + firstarg="$1" + if shift; then +- case "$firstarg" in ++ case $firstarg in + *o*) + firstarg=`echo "$firstarg" | sed s/o//` + tar "$firstarg" "$@" && exit 0 + ;; + esac +- case "$firstarg" in ++ case $firstarg in + *h*) + firstarg=`echo "$firstarg" | sed s/h//` + tar "$firstarg" "$@" && exit 0 +@@ -356,5 +371,6 @@ + # eval: (add-hook 'write-file-hooks 'time-stamp) + # time-stamp-start: "scriptversion=" + # time-stamp-format: "%:y-%02m-%02d.%02H" +-# time-stamp-end: "$" ++# time-stamp-time-zone: "UTC" ++# time-stamp-end: "; # UTC" + # End: +diff -Nur exmap-console-0.4.1.orig/src/Makefile.in exmap-console-0.4.1/src/Makefile.in +--- exmap-console-0.4.1.orig/src/Makefile.in 2007-02-26 12:44:02.000000000 +0100 ++++ exmap-console-0.4.1/src/Makefile.in 2011-01-11 12:44:16.000000000 +0100 +@@ -1,8 +1,9 @@ +-# Makefile.in generated by automake 1.9.6 from Makefile.am. ++# Makefile.in generated by automake 1.11.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, ++# Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -14,15 +15,12 @@ + + @SET_MAKE@ + +-srcdir = @srcdir@ +-top_srcdir = @top_srcdir@ + VPATH = @srcdir@ + pkgdatadir = $(datadir)/@PACKAGE@ +-pkglibdir = $(libdir)/@PACKAGE@ + pkgincludedir = $(includedir)/@PACKAGE@ +-top_builddir = .. ++pkglibdir = $(libdir)/@PACKAGE@ ++pkglibexecdir = $(libexecdir)/@PACKAGE@ + am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +-INSTALL = @INSTALL@ + install_sh_DATA = $(install_sh) -c -m 644 + install_sh_PROGRAM = $(install_sh) -c + install_sh_SCRIPT = $(install_sh) -c +@@ -43,8 +41,8 @@ + $(ACLOCAL_M4) + mkinstalldirs = $(install_sh) -d + CONFIG_CLEAN_FILES = ++CONFIG_CLEAN_VPATH_FILES = + am__installdirs = "$(DESTDIR)$(bindir)" +-binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) + PROGRAMS = $(bin_PROGRAMS) + am__exmap_SOURCES_DIST = interactive.c exmap.c exelf.c + @INTERACTIVE_TRUE@am__objects_1 = interactive.$(OBJEXT) +@@ -58,9 +56,10 @@ + am_exmapserver_OBJECTS = exmapserver.$(OBJEXT) + exmapserver_OBJECTS = $(am_exmapserver_OBJECTS) + exmapserver_DEPENDENCIES = $(am__DEPENDENCIES_1) +-DEFAULT_INCLUDES = -I. -I$(srcdir) ++DEFAULT_INCLUDES = -I.@am__isrc@ + depcomp = $(SHELL) $(top_srcdir)/depcomp + am__depfiles_maybe = depfiles ++am__mv = mv -f + COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) + CCLD = $(CC) +@@ -72,8 +71,6 @@ + CTAGS = ctags + DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + ACLOCAL = @ACLOCAL@ +-AMDEP_FALSE = @AMDEP_FALSE@ +-AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AUTOCONF = @AUTOCONF@ + AUTOHEADER = @AUTOHEADER@ +@@ -86,8 +83,6 @@ + CYGPATH_W = @CYGPATH_W@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ +-DODOCS_FALSE = @DODOCS_FALSE@ +-DODOCS_TRUE = @DODOCS_TRUE@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ +@@ -95,38 +90,41 @@ + GCC_CFLAGS = @GCC_CFLAGS@ + GLIB_CFLAGS = @GLIB_CFLAGS@ + GLIB_LIBS = @GLIB_LIBS@ +-HAVE_HELPTOMAN_FALSE = @HAVE_HELPTOMAN_FALSE@ +-HAVE_HELPTOMAN_TRUE = @HAVE_HELPTOMAN_TRUE@ + HELPTOMAN = @HELPTOMAN@ ++INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ + INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +-INTERACTIVE_FALSE = @INTERACTIVE_FALSE@ +-INTERACTIVE_TRUE = @INTERACTIVE_TRUE@ + LDFLAGS = @LDFLAGS@ + LIBOBJS = @LIBOBJS@ + LIBS = @LIBS@ + LTLIBOBJS = @LTLIBOBJS@ + MAKEINFO = @MAKEINFO@ ++MKDIR_P = @MKDIR_P@ + OBJEXT = @OBJEXT@ + PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ ++PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PKG_CONFIG = @PKG_CONFIG@ ++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ ++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ + READLINE_CFLAGS = @READLINE_CFLAGS@ + READLINE_LIBS = @READLINE_LIBS@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + STRIP = @STRIP@ + VERSION = @VERSION@ ++abs_builddir = @abs_builddir@ ++abs_srcdir = @abs_srcdir@ ++abs_top_builddir = @abs_top_builddir@ ++abs_top_srcdir = @abs_top_srcdir@ + ac_ct_CC = @ac_ct_CC@ +-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ +-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ + am__include = @am__include@ + am__leading_dot = @am__leading_dot@ + am__quote = @am__quote@ +@@ -134,6 +132,7 @@ + am__untar = @am__untar@ + bindir = @bindir@ + build_alias = @build_alias@ ++builddir = @builddir@ + datadir = @datadir@ + datarootdir = @datarootdir@ + docdir = @docdir@ +@@ -157,8 +156,12 @@ + psdir = @psdir@ + sbindir = @sbindir@ + sharedstatedir = @sharedstatedir@ ++srcdir = @srcdir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ ++top_build_prefix = @top_build_prefix@ ++top_builddir = @top_builddir@ ++top_srcdir = @top_srcdir@ + INCLUDES = -DSBINDIR=\"$(sbindir)\" + AM_CFLAGS = $(GCC_CFLAGS) $(GLIB_CFLAGS) $(READLINE_CFLAGS) + @INTERACTIVE_TRUE@interactive = interactive.c +@@ -177,14 +180,14 @@ + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ ++ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ ++ && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/Makefile'; \ +- cd $(top_srcdir) && \ +- $(AUTOMAKE) --gnu src/Makefile ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/Makefile'; \ ++ $(am__cd) $(top_srcdir) && \ ++ $(AUTOMAKE) --gnu src/Makefile + .PRECIOUS: Makefile + Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ +@@ -202,38 +205,53 @@ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + $(ACLOCAL_M4): $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++$(am__aclocal_m4_deps): + install-binPROGRAMS: $(bin_PROGRAMS) + @$(NORMAL_INSTALL) +- test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)" +- @list='$(bin_PROGRAMS)'; for p in $$list; do \ +- p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ +- if test -f $$p \ +- ; then \ +- f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \ +- echo " $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \ +- $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \ +- else :; fi; \ +- done ++ test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" ++ @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ ++ for p in $$list; do echo "$$p $$p"; done | \ ++ sed 's/$(EXEEXT)$$//' | \ ++ while read p p1; do if test -f $$p; \ ++ then echo "$$p"; echo "$$p"; else :; fi; \ ++ done | \ ++ sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \ ++ -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \ ++ sed 'N;N;N;s,\n, ,g' | \ ++ $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \ ++ { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \ ++ if ($$2 == $$4) files[d] = files[d] " " $$1; \ ++ else { print "f", $$3 "/" $$4, $$1; } } \ ++ END { for (d in files) print "f", d, files[d] }' | \ ++ while read type dir files; do \ ++ if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \ ++ test -z "$$files" || { \ ++ echo " $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(bindir)$$dir'"; \ ++ $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \ ++ } \ ++ ; done + + uninstall-binPROGRAMS: + @$(NORMAL_UNINSTALL) +- @list='$(bin_PROGRAMS)'; for p in $$list; do \ +- f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \ +- echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \ +- rm -f "$(DESTDIR)$(bindir)/$$f"; \ +- done ++ @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ ++ files=`for p in $$list; do echo "$$p"; done | \ ++ sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \ ++ -e 's/$$/$(EXEEXT)/' `; \ ++ test -n "$$list" || exit 0; \ ++ echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \ ++ cd "$(DESTDIR)$(bindir)" && rm -f $$files + + clean-binPROGRAMS: + -test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS) + exmap$(EXEEXT): $(exmap_OBJECTS) $(exmap_DEPENDENCIES) + @rm -f exmap$(EXEEXT) +- $(LINK) $(exmap_LDFLAGS) $(exmap_OBJECTS) $(exmap_LDADD) $(LIBS) ++ $(LINK) $(exmap_OBJECTS) $(exmap_LDADD) $(LIBS) + exmapd$(EXEEXT): $(exmapd_OBJECTS) $(exmapd_DEPENDENCIES) + @rm -f exmapd$(EXEEXT) +- $(LINK) $(exmapd_LDFLAGS) $(exmapd_OBJECTS) $(exmapd_LDADD) $(LIBS) ++ $(LINK) $(exmapd_OBJECTS) $(exmapd_LDADD) $(LIBS) + exmapserver$(EXEEXT): $(exmapserver_OBJECTS) $(exmapserver_DEPENDENCIES) + @rm -f exmapserver$(EXEEXT) +- $(LINK) $(exmapserver_LDFLAGS) $(exmapserver_OBJECTS) $(exmapserver_LDADD) $(LIBS) ++ $(LINK) $(exmapserver_OBJECTS) $(exmapserver_LDADD) $(LIBS) + + mostlyclean-compile: + -rm -f *.$(OBJEXT) +@@ -248,92 +266,98 @@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/interactive.Po@am__quote@ + + .c.o: +-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ++@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(COMPILE) -c $< + + .c.obj: +-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` ++@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` +-uninstall-info-am: + + ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique + tags: TAGS + + TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +- tags=; \ ++ set x; \ + here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ +- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ ++ shift; \ ++ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ +- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +- $$tags $$unique; \ ++ if test $$# -gt 0; then \ ++ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ++ "$$@" $$unique; \ ++ else \ ++ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ++ $$unique; \ ++ fi; \ + fi + ctags: CTAGS + CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +- tags=; \ +- here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ +- test -z "$(CTAGS_ARGS)$$tags$$unique" \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ ++ test -z "$(CTAGS_ARGS)$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ +- $$tags $$unique ++ $$unique + + GTAGS: + here=`$(am__cd) $(top_builddir) && pwd` \ +- && cd $(top_srcdir) \ +- && gtags -i $(GTAGS_ARGS) $$here ++ && $(am__cd) $(top_srcdir) \ ++ && gtags -i $(GTAGS_ARGS) "$$here" + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + + distdir: $(DISTFILES) +- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ +- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ +- list='$(DISTFILES)'; for file in $$list; do \ +- case $$file in \ +- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ +- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ +- esac; \ ++ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ list='$(DISTFILES)'; \ ++ dist_files=`for file in $$list; do echo $$file; done | \ ++ sed -e "s|^$$srcdirstrip/||;t" \ ++ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ ++ case $$dist_files in \ ++ */*) $(MKDIR_P) `echo "$$dist_files" | \ ++ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ ++ sort -u` ;; \ ++ esac; \ ++ for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ +- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ +- if test "$$dir" != "$$file" && test "$$dir" != "."; then \ +- dir="/$$dir"; \ +- $(mkdir_p) "$(distdir)$$dir"; \ +- else \ +- dir=''; \ +- fi; \ + if test -d $$d/$$file; then \ ++ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ ++ if test -d "$(distdir)/$$file"; then \ ++ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ ++ fi; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ +- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ ++ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ ++ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ +- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ ++ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ + else \ +- test -f $(distdir)/$$file \ +- || cp -p $$d/$$file $(distdir)/$$file \ ++ test -f "$(distdir)/$$file" \ ++ || cp -p $$d/$$file "$(distdir)/$$file" \ + || exit 1; \ + fi; \ + done +@@ -342,7 +366,7 @@ + all-am: Makefile $(PROGRAMS) + installdirs: + for dir in "$(DESTDIR)$(bindir)"; do \ +- test -z "$$dir" || $(mkdir_p) "$$dir"; \ ++ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ + done + install: install-am + install-exec: install-exec-am +@@ -364,6 +388,7 @@ + + distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) + -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES) + + maintainer-clean-generic: +@@ -385,18 +410,38 @@ + + html: html-am + ++html-am: ++ + info: info-am + + info-am: + + install-data-am: + ++install-dvi: install-dvi-am ++ ++install-dvi-am: ++ + install-exec-am: install-binPROGRAMS + ++install-html: install-html-am ++ ++install-html-am: ++ + install-info: install-info-am + ++install-info-am: ++ + install-man: + ++install-pdf: install-pdf-am ++ ++install-pdf-am: ++ ++install-ps: install-ps-am ++ ++install-ps-am: ++ + installcheck-am: + + maintainer-clean: maintainer-clean-am +@@ -416,18 +461,23 @@ + + ps-am: + +-uninstall-am: uninstall-binPROGRAMS uninstall-info-am ++uninstall-am: uninstall-binPROGRAMS ++ ++.MAKE: install-am install-strip + + .PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \ + clean-generic ctags distclean distclean-compile \ + distclean-generic distclean-tags distdir dvi dvi-am html \ + html-am info info-am install install-am install-binPROGRAMS \ +- install-data install-data-am install-exec install-exec-am \ +- install-info install-info-am install-man install-strip \ ++ install-data install-data-am install-dvi install-dvi-am \ ++ install-exec install-exec-am install-html install-html-am \ ++ install-info install-info-am install-man install-pdf \ ++ install-pdf-am install-ps install-ps-am install-strip \ + installcheck installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ + mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \ +- uninstall-am uninstall-binPROGRAMS uninstall-info-am ++ uninstall-am uninstall-binPROGRAMS ++ + + # Tell versions [3.59,3.63) of GNU make to not export all variables. + # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/package/exmap/patches/patch-Makefile_in b/package/exmap/patches/patch-Makefile_in deleted file mode 100644 index cb3281aff..000000000 --- a/package/exmap/patches/patch-Makefile_in +++ /dev/null @@ -1,12 +0,0 @@ -$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ ---- exmap-console-0.4.1.orig/Makefile.in 2007-02-26 12:44:02.000000000 +0100 -+++ exmap-console-0.4.1/Makefile.in 2009-04-18 16:16:03.926793719 +0200 -@@ -155,7 +155,7 @@ sbindir = @sbindir@ - sharedstatedir = @sharedstatedir@ - sysconfdir = @sysconfdir@ - target_alias = @target_alias@ --SUBDIRS = kernel src doc -+SUBDIRS = src - DISTCLEANFILES = *~ Makefile.in install-sh missing depcomp *.m4 config.log config.status Makefile - all: all-recursive - 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/expat/patches/patch-conftools_ltmain_sh b/package/expat/patches/patch-conftools_ltmain_sh new file mode 100644 index 000000000..7c2364b93 --- /dev/null +++ b/package/expat/patches/patch-conftools_ltmain_sh @@ -0,0 +1,11 @@ +--- expat-2.0.1.orig/conftools/ltmain.sh 2006-12-19 20:28:40.000000000 +0100 ++++ expat-2.0.1/conftools/ltmain.sh 2011-01-14 01:24:32.000000000 +0100 +@@ -1623,7 +1623,7 @@ EOF + # -pg pass through profiling flag for GCC + # @file GCC response files + -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*|-pg| \ +- -t[45]*|-txscale*|@*) ++ -t[45]*|-txscale*|@*|-fstack-protector*|-flto) + + # Unknown arguments in both finalize_command and compile_command need + # to be aesthetically quoted because they are evaled later. diff --git a/package/faad2/patches/patch-ltmain_sh b/package/faad2/patches/patch-ltmain_sh new file mode 100644 index 000000000..7c24bb64e --- /dev/null +++ b/package/faad2/patches/patch-ltmain_sh @@ -0,0 +1,11 @@ +--- faad2-2.7.orig/ltmain.sh 2006-03-22 01:06:55.000000000 +0100 ++++ faad2-2.7/ltmain.sh 2011-01-14 23:20:01.000000000 +0100 +@@ -1623,7 +1623,7 @@ EOF + # -pg pass through profiling flag for GCC + # @file GCC response files + -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*|-pg| \ +- -t[45]*|-txscale*|@*) ++ -t[45]*|-txscale*|@*|-fstack-protector*|-flto) + + # Unknown arguments in both finalize_command and compile_command need + # to be aesthetically quoted because they are evaled later. diff --git a/package/fetchmail/Makefile b/package/fetchmail/Makefile index 2734f6d31..f3af7fe66 100644 --- a/package/fetchmail/Makefile +++ b/package/fetchmail/Makefile @@ -14,10 +14,10 @@ PKG_SITES:= http://download.berlios.de/fetchmail/ DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 -PKG_FLAVOURS:= SSL -PKGFD_SSL:= enable SSL support -PKGFS_SSL:= libopenssl -PKGFB_SSL:= openssl +PKG_FLAVOURS_FETCHMAIL:=WITH_SSL +PKGFD_WITH_SSL:= enable SSL support +PKGFS_WITH_SSL:= libopenssl +PKGFB_WITH_SSL:= openssl include ${TOPDIR}/mk/package.mk @@ -25,7 +25,7 @@ $(eval $(call PKG_template,FETCHMAIL,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},$ CONFIGURE_ARGS+= --without-hesiod -ifeq (${ADK_PACKAGE_FETCHMAIL_SSL},y) +ifeq (${ADK_PACKAGE_FETCHMAIL_WITH_SSL},y) CONFIGURE_ARGS+= --with-ssl='${STAGING_TARGET_DIR}/usr' else CONFIGURE_ARGS+= --without-ssl 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/file/patches/patch-ltmain_sh b/package/file/patches/patch-ltmain_sh new file mode 100644 index 000000000..f0bc58c34 --- /dev/null +++ b/package/file/patches/patch-ltmain_sh @@ -0,0 +1,11 @@ +--- file-5.04.orig/ltmain.sh 2009-02-09 17:40:06.000000000 +0100 ++++ file-5.04/ltmain.sh 2011-01-14 23:37:41.000000000 +0100 +@@ -1735,7 +1735,7 @@ EOF + # -F/path gives path to uninstalled frameworks, gcc on darwin + # @file GCC response files + -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) + + # Unknown arguments in both finalize_command and compile_command need + # to be aesthetically quoted because they are evaled later. diff --git a/package/findutils/Makefile b/package/findutils/Makefile index d53312381..0f905d67b 100644 --- a/package/findutils/Makefile +++ b/package/findutils/Makefile @@ -13,17 +13,23 @@ PKG_DEPENDS:= libpthread PKG_URL:= http://www.gnu.org/software/findutils/ PKG_SITES:= http://ftp.gnu.org/pub/gnu/findutils/ +PKG_SUBPKGS:= FINDUTILS LOCATE +PKGSD_LOCATE:= Locate utility + include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,FINDUTILS,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +$(eval $(call PKG_template,LOCATE,locate,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LOCATE},${PKG_SECTION})) CONFIGURE_ENV+= gl_cv_func_wcwidth_works=yes post-install: - $(INSTALL_DIR) $(IDIR_FINDUTILS)/usr/bin $(IDIR_FINDUTILS)/usr/libexec - $(INSTALL_BIN) $(WRKINST)/usr/bin/{find,locate,oldfind,updatedb,xargs} \ + $(INSTALL_DIR) $(IDIR_FINDUTILS)/usr/bin + $(INSTALL_BIN) $(WRKINST)/usr/bin/{find,oldfind,xargs} \ $(IDIR_FINDUTILS)/usr/bin + ${INSTALL_DIR} ${IDIR_LOCATE}/usr/{bin,libexec} + ${INSTALL_BIN} ${WRKINST}/usr/bin/{locate,updatedb} ${IDIR_LOCATE}/usr/bin/ $(INSTALL_BIN) $(WRKINST)/usr/libexec/{bigram,code,frcode} \ - $(IDIR_FINDUTILS)/usr/libexec + $(IDIR_LOCATE)/usr/libexec include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/firefox/Makefile b/package/firefox/Makefile index 0e1c6fe9f..b5d034065 100644 --- a/package/firefox/Makefile +++ b/package/firefox/Makefile @@ -11,7 +11,7 @@ PKG_DESCR:= graphical webbrowser PKG_SECTION:= x11/apps PKG_DEPENDS:= libpthread alsa-lib dbus-glib glib libgtk libnotify PKG_DEPENDS+= nspr nss libjpeg atk pango cairo libxt libx11 libstdcxx -PKG_DEPENDS+= libxdamage libxfixes libidl libsqlite +PKG_DEPENDS+= libxdamage libxfixes libidl libsqlite libxcomposite gdk-pixbuf PKG_BUILDDEP:= alsa-lib dbus-glib glib gtk+ libnotify libIDL libX11 PKG_BUILDDEP+= nspr nss jpeg libXt fontconfig sqlite PKG_URL:= http://www.mozilla.org/ diff --git a/package/flac/patches/patch-ltmain_sh b/package/flac/patches/patch-ltmain_sh new file mode 100644 index 000000000..ded69d58a --- /dev/null +++ b/package/flac/patches/patch-ltmain_sh @@ -0,0 +1,11 @@ +--- flac-1.2.1.orig/ltmain.sh 2005-04-26 20:23:39.000000000 +0200 ++++ flac-1.2.1/ltmain.sh 2011-01-15 11:22:29.000000000 +0100 +@@ -1533,7 +1533,7 @@ EOF + # +DA*, +DD* enable 64-bit mode on the HP compiler + # -q* pass through compiler args for the IBM compiler + # -m* pass through architecture-specific compiler args for GCC +- -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*) ++ -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*|-fstack-protector*|-flto) + + # Unknown arguments in both finalize_command and compile_command need + # to be aesthetically quoted because they are evaled later. diff --git a/package/fltk/Makefile b/package/fltk/Makefile index fc2e54ad5..b29de4bc5 100644 --- a/package/fltk/Makefile +++ b/package/fltk/Makefile @@ -13,6 +13,9 @@ PKG_BUILDDEP:= libX11 libXi MesaLib freeglut PKG_URL:= http://www.fltk.org/ PKG_SITES:= http://ftp.funet.fi/pub/mirrors/ftp.easysw.com/pub/fltk/snapshots/ +PKG_NEED_CXX:= 1 +PKG_CXX:= LIBFLTK + PKG_SUBPKGS:= LIBFLTK PKG_ARCH_DEPENDS:= x86 x86_64 mips mipsel mips64 mips64el @@ -23,6 +26,17 @@ include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,LIBFLTK,libfltk,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +LIBRARIES:=-nodefaultlibs -luClibc++ -lgcc -lm +ifeq ($(ADK_TOOLCHAIN_GCC_USE_SSP),y) +LIBRARIES+=-lssp +endif + +ifeq ($(ADK_COMPILE_LIBFLTK_WITH_UCLIBCXX),y) +CONFIGURE_ENV+= CXXFLAGS="-fno-threadsafe-statics -fno-builtin -nostdinc++ \ + -I${STAGING_TARGET_DIR}/usr/include/uClibc++" \ + LIBS="$(LIBRARIES)" +endif + post-install: $(INSTALL_DIR) $(IDIR_LIBFLTK)/usr/lib $(CP) ${WRKINST}/usr/lib/libfltk*.so* $(IDIR_LIBFLTK)/usr/lib diff --git a/package/fltk/patches/patch-Makefile b/package/fltk/patches/patch-Makefile new file mode 100644 index 000000000..466aef887 --- /dev/null +++ b/package/fltk/patches/patch-Makefile @@ -0,0 +1,11 @@ +--- fltk-2.0.x-r7513.orig/Makefile 2010-04-15 18:29:49.000000000 +0200 ++++ fltk-2.0.x-r7513/Makefile 2011-01-14 22:01:49.000000000 +0100 +@@ -25,7 +25,7 @@ + + include makeinclude + +-DIRS = src $(LOCALIMAGES) images OpenGL fluid glut test ++DIRS = src $(LOCALIMAGES) images OpenGL fluid + + all: makeinclude + for dir in $(DIRS); do\ 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/fluxbox/Makefile b/package/fluxbox/Makefile index 885972f1a..74e104d67 100644 --- a/package/fluxbox/Makefile +++ b/package/fluxbox/Makefile @@ -14,7 +14,7 @@ PKG_BUILDDEP:= libXpm PKG_URL:= http://www.fluxbox.org/ PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=fluxbox/} -PKG_FLAVOURS:= WITH_IMLIB2 +PKG_FLAVOURS_FLUXBOX:= WITH_IMLIB2 PKGFD_WITH_IMLIB2:= enable imlib2 support PKGFS_WITH_IMLIB2:= imlib2 PKGFB_WITH_IMLIB2:= imlib2 diff --git a/package/font-bh-100dpi/Makefile b/package/font-bh-100dpi/Makefile index fc0b6c227..94c92880c 100644 --- a/package/font-bh-100dpi/Makefile +++ b/package/font-bh-100dpi/Makefile @@ -9,6 +9,7 @@ PKG_RELEASE:= 1 PKG_MD5SUM:= d9383b2ddda241a464343b7b4de370a9 PKG_DESCR:= X fonts PKG_SECTION:= x11/fonts +PKG_BUILDDEP:= font-util PKG_URL:= http://www.x.org/ PKG_SITES:= ${MASTER_SITE_XORG} diff --git a/package/font-bh-75dpi/Makefile b/package/font-bh-75dpi/Makefile index 645aac5b4..7aaaba536 100644 --- a/package/font-bh-75dpi/Makefile +++ b/package/font-bh-75dpi/Makefile @@ -9,6 +9,7 @@ PKG_RELEASE:= 1 PKG_MD5SUM:= 200b38e879dcbf922ca2a9f71ad44657 PKG_DESCR:= X fonts PKG_SECTION:= x11/fonts +PKG_BUILDDEP:= font-util PKG_URL:= http://www.x.org/ PKG_SITES:= ${MASTER_SITE_XORG} diff --git a/package/font-bh-lucidatypewriter-100dpi/Makefile b/package/font-bh-lucidatypewriter-100dpi/Makefile index 8df46f86f..443eb4710 100644 --- a/package/font-bh-lucidatypewriter-100dpi/Makefile +++ b/package/font-bh-lucidatypewriter-100dpi/Makefile @@ -9,6 +9,7 @@ PKG_RELEASE:= 1 PKG_MD5SUM:= 8fa38b7845c10ff83d6077a1e238b15b PKG_DESCR:= X fonts PKG_SECTION:= x11/fonts +PKG_BUILDDEP:= font-util PKG_URL:= http://www.x.org/ PKG_SITES:= ${MASTER_SITE_XORG} diff --git a/package/font-bh-lucidatypewriter-75dpi/Makefile b/package/font-bh-lucidatypewriter-75dpi/Makefile index 271fe18ad..ebe555528 100644 --- a/package/font-bh-lucidatypewriter-75dpi/Makefile +++ b/package/font-bh-lucidatypewriter-75dpi/Makefile @@ -9,6 +9,7 @@ PKG_RELEASE:= 1 PKG_MD5SUM:= f36b68aabef2d57258131ce6136c6f50 PKG_DESCR:= X fonts PKG_SECTION:= x11/fonts +PKG_BUILDDEP:= font-util PKG_URL:= http://www.x.org/ PKG_SITES:= ${MASTER_SITE_XORG} diff --git a/package/font-bh-ttf/Makefile b/package/font-bh-ttf/Makefile index e36e8710e..fd0872fec 100644 --- a/package/font-bh-ttf/Makefile +++ b/package/font-bh-ttf/Makefile @@ -9,6 +9,7 @@ PKG_RELEASE:= 1 PKG_MD5SUM:= baea1bb10808857e595f13c6be9cbfbe PKG_DESCR:= X fonts PKG_SECTION:= x11/fonts +PKG_BUILDDEP:= font-util PKG_URL:= http://www.x.org/ PKG_SITES:= ${MASTER_SITE_XORG} diff --git a/package/font-bh-type1/Makefile b/package/font-bh-type1/Makefile index 3cba71409..d9c2ab9dd 100644 --- a/package/font-bh-type1/Makefile +++ b/package/font-bh-type1/Makefile @@ -9,6 +9,7 @@ PKG_RELEASE:= 1 PKG_MD5SUM:= 000da66f92370ac59e3df1b6719fdd9a PKG_DESCR:= X fonts PKG_SECTION:= x11/fonts +PKG_BUILDDEP:= font-util PKG_URL:= http://www.x.org/ PKG_SITES:= ${MASTER_SITE_XORG} diff --git a/package/font-bitstream-100dpi/Makefile b/package/font-bitstream-100dpi/Makefile index a65b12d9d..20c1c7937 100644 --- a/package/font-bitstream-100dpi/Makefile +++ b/package/font-bitstream-100dpi/Makefile @@ -9,6 +9,7 @@ PKG_RELEASE:= 1 PKG_MD5SUM:= 823c3c2a1a2307bdca5961145e3db37d PKG_DESCR:= X fonts PKG_SECTION:= x11/fonts +PKG_BUILDDEP:= font-util PKG_URL:= http://www.x.org/ PKG_SITES:= ${MASTER_SITE_XORG} diff --git a/package/font-bitstream-75dpi/Makefile b/package/font-bitstream-75dpi/Makefile index 40f4cec26..2bb5c8b83 100644 --- a/package/font-bitstream-75dpi/Makefile +++ b/package/font-bitstream-75dpi/Makefile @@ -9,6 +9,7 @@ PKG_RELEASE:= 1 PKG_MD5SUM:= f8e982bcaaed199fdac03e9fc12b2952 PKG_DESCR:= X fonts PKG_SECTION:= x11/fonts +PKG_BUILDDEP:= font-util PKG_URL:= http://www.x.org/ PKG_SITES:= ${MASTER_SITE_XORG} diff --git a/package/font-bitstream-type1/Makefile b/package/font-bitstream-type1/Makefile index 97e8ada96..654aea3d9 100644 --- a/package/font-bitstream-type1/Makefile +++ b/package/font-bitstream-type1/Makefile @@ -9,6 +9,7 @@ PKG_RELEASE:= 1 PKG_MD5SUM:= 08722299c09753a5540a0752ec5b5fc7 PKG_DESCR:= X fonts PKG_SECTION:= x11/fonts +PKG_BUILDDEP:= font-util PKG_URL:= http://www.x.org/ PKG_SITES:= ${MASTER_SITE_XORG} diff --git a/package/font-xfree86-type1/Makefile b/package/font-xfree86-type1/Makefile index 2a08c9b10..559bbb448 100644 --- a/package/font-xfree86-type1/Makefile +++ b/package/font-xfree86-type1/Makefile @@ -9,6 +9,7 @@ PKG_RELEASE:= 1 PKG_MD5SUM:= 785f2b6e8d6d0dafec08b8d4c54ae2e3 PKG_DESCR:= X fonts PKG_SECTION:= x11/fonts +PKG_BUILDDEP:= font-util PKG_URL:= http://www.x.org/ PKG_SITES:= ${MASTER_SITE_XORG} diff --git a/package/fontconfig/Makefile b/package/fontconfig/Makefile index 119c09e9a..9a836fca9 100644 --- a/package/fontconfig/Makefile +++ b/package/fontconfig/Makefile @@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= fontconfig PKG_VERSION:= 2.8.0 -PKG_RELEASE:= 1 +PKG_RELEASE:= 2 PKG_MD5SUM:= 77e15a92006ddc2adbb06f840d591c0e PKG_DESCR:= fontconfig PKG_SECTION:= libs @@ -26,7 +26,8 @@ CONFIGURE_ARGS+= --with-arch=${ARCH} \ --disable-docs post-install: - ${INSTALL_DIR} ${IDIR_FONTCONFIG}/usr/lib + ${INSTALL_DIR} ${IDIR_FONTCONFIG}/usr/lib ${IDIR_FONTCONFIG}/etc/fonts ${CP} ${WRKINST}/usr/lib/libfontconfig.so* ${IDIR_FONTCONFIG}/usr/lib + $(CP) ${WRKINST}/etc/fonts/* ${IDIR_FONTCONFIG}/etc/fonts include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/fontconfig/patches/patch-ltmain_sh b/package/fontconfig/patches/patch-ltmain_sh new file mode 100644 index 000000000..97a052432 --- /dev/null +++ b/package/fontconfig/patches/patch-ltmain_sh @@ -0,0 +1,11 @@ +--- fontconfig-2.8.0.orig/ltmain.sh 2009-11-16 21:49:43.000000000 +0100 ++++ fontconfig-2.8.0/ltmain.sh 2011-01-14 00:39:50.000000000 +0100 +@@ -4765,7 +4765,7 @@ func_mode_link () + # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC + # @file GCC response files + -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) + func_quote_for_eval "$arg" + arg="$func_quote_for_eval_result" + func_append compile_command " $arg" 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/freeglut/patches/patch-ltmain_sh b/package/freeglut/patches/patch-ltmain_sh new file mode 100644 index 000000000..7ae2ccf9f --- /dev/null +++ b/package/freeglut/patches/patch-ltmain_sh @@ -0,0 +1,11 @@ +--- freeglut-2.6.0.orig/ltmain.sh 2008-04-29 23:33:55.000000000 +0200 ++++ freeglut-2.6.0/ltmain.sh 2011-01-14 21:40:47.000000000 +0100 +@@ -1676,7 +1676,7 @@ EOF + # -F/path gives path to uninstalled frameworks, gcc on darwin + # @file GCC response files + -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) + + # Unknown arguments in both finalize_command and compile_command need + # to be aesthetically quoted because they are evaled later. diff --git a/package/freeradius-client/patches/patch-ltmain_sh b/package/freeradius-client/patches/patch-ltmain_sh new file mode 100644 index 000000000..9c3f70877 --- /dev/null +++ b/package/freeradius-client/patches/patch-ltmain_sh @@ -0,0 +1,11 @@ +--- freeradius-client-1.1.6.orig/ltmain.sh 2008-03-05 19:02:55.000000000 +0100 ++++ freeradius-client-1.1.6/ltmain.sh 2011-01-15 11:55:40.000000000 +0100 +@@ -1653,7 +1653,7 @@ EOF + # -pg pass through profiling flag for GCC + # @file GCC response files + -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*|-pg| \ +- -t[45]*|-txscale*|@*) ++ -t[45]*|-txscale*|@*|-fstack-protector*|-flto) + + # Unknown arguments in both finalize_command and compile_command need + # to be aesthetically quoted because they are evaled later. diff --git a/package/freeradius-server/patches/patch-ltmain_sh b/package/freeradius-server/patches/patch-ltmain_sh new file mode 100644 index 000000000..2730428cd --- /dev/null +++ b/package/freeradius-server/patches/patch-ltmain_sh @@ -0,0 +1,11 @@ +--- freeradius-server-2.1.8.orig/ltmain.sh 2009-12-30 16:44:35.000000000 +0100 ++++ freeradius-server-2.1.8/ltmain.sh 2011-01-15 13:13:33.000000000 +0100 +@@ -1623,7 +1623,7 @@ EOF + # -pg pass through profiling flag for GCC + # @file GCC response files + -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*|-pg| \ +- -t[45]*|-txscale*|@*) ++ -t[45]*|-txscale*|@*|-fstack-protector*|-flto) + + # Unknown arguments in both finalize_command and compile_command need + # to be aesthetically quoted because they are evaled later. diff --git a/package/freetype/patches/patch-builds_unix_ltmain_sh b/package/freetype/patches/patch-builds_unix_ltmain_sh new file mode 100644 index 000000000..0d7344b45 --- /dev/null +++ b/package/freetype/patches/patch-builds_unix_ltmain_sh @@ -0,0 +1,11 @@ +--- freetype-2.3.11.orig/builds/unix/ltmain.sh 2009-10-10 20:37:53.000000000 +0200 ++++ freetype-2.3.11/builds/unix/ltmain.sh 2011-01-14 00:21:25.000000000 +0100 +@@ -4765,7 +4765,7 @@ func_mode_link () + # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC + # @file GCC response files + -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) + func_quote_for_eval "$arg" + arg="$func_quote_for_eval_result" + func_append compile_command " $arg" diff --git a/package/gatling/patches/patch-GNUmakefile b/package/gatling/patches/patch-GNUmakefile index d95051e6e..723400f5a 100644 --- a/package/gatling/patches/patch-GNUmakefile +++ b/package/gatling/patches/patch-GNUmakefile @@ -1,7 +1,16 @@ $Id$ ---- gatling-0.8.orig/GNUmakefile Thu May 19 05:30:26 2005 -+++ gatling-0.8/GNUmakefile Mon Jul 9 11:52:58 2007 -@@ -96,9 +96,10 @@ libiconv: tryiconv.c +--- gatling-0.11.orig/GNUmakefile 2008-12-05 13:31:01.000000000 +0100 ++++ gatling-0.11/GNUmakefile 2011-01-15 14:10:40.000000000 +0100 +@@ -17,7 +17,7 @@ CROSS= + #CROSS=i686-mingw32- + CC=$(CROSS)gcc + CFLAGS=-pipe -Wall +-LDFLAGS= ++LDFLAGS?= + + path = $(subst :, ,$(PATH)) + diet_path = $(foreach dir,$(path),$(wildcard $(dir)/diet)) +@@ -147,9 +147,10 @@ havesetresuid.h: trysetresuid.c dummy.c: touch $@ @@ -11,5 +20,5 @@ $Id$ - -ranlib $@ + -${RANLIB} $@ - LDLIBS+=`cat libsocket libiconv` + LDLIBS+=`cat libsocket libiconv libcrypt` diff --git a/package/gcc/Makefile b/package/gcc/Makefile index 1f2ce8f99..faf1f9e31 100644 --- a/package/gcc/Makefile +++ b/package/gcc/Makefile @@ -36,7 +36,8 @@ CONFIGURE_ARGS+= --enable-languages=c,c++ \ --disable-libmudflap \ --disable-libgomp \ --disable-multilib \ - --disable-libstdcxx-pch + --disable-libstdcxx-pch \ + --enable-cxx-flags="${TARGET_LDFLAGS}" post-install: ${INSTALL_DIR} ${IDIR_GCC}/usr/lib/gcc ${IDIR_GCC}/usr/bin diff --git a/package/gcc/patches/cross-gcc-fix.patch b/package/gcc/patches/cross-gcc-fix.patch index 9b5d55318..f39b35fb9 100644 --- a/package/gcc/patches/cross-gcc-fix.patch +++ b/package/gcc/patches/cross-gcc-fix.patch @@ -1,7 +1,7 @@ diff -Nur gcc-4.4.2.orig/gcc/Makefile.in gcc-4.4.2/gcc/Makefile.in ---- gcc-4.4.2.orig/gcc/Makefile.in 2009-07-25 19:53:35.000000000 +0200 -+++ gcc-4.4.2/gcc/Makefile.in 2009-11-22 15:30:27.000000000 +0100 -@@ -898,7 +898,8 @@ +--- gcc-4.5.2.orig/gcc/Makefile.in 2010-09-02 15:05:30.000000000 +0200 ++++ gcc-4.5.2/gcc/Makefile.in 2011-01-15 14:29:18.000000000 +0100 +@@ -980,7 +980,8 @@ ALL_CXXFLAGS = $(T_CFLAGS) $(CXXFLAGS) $ # Likewise. Put INCLUDES at the beginning: this way, if some autoconf macro # puts -I options in CPPFLAGS, our include files in the srcdir will always # win against random include files in /usr/include. @@ -9,5 +9,5 @@ diff -Nur gcc-4.4.2.orig/gcc/Makefile.in gcc-4.4.2/gcc/Makefile.in +#ALL_CPPFLAGS = $(INCLUDES) $(CPPFLAGS) +ALL_CPPFLAGS = $(INCLUDES) - # Build and host support libraries. - LIBIBERTY = ../libiberty/libiberty.a + # This is the variable to use when using $(COMPILER). + ifneq ($(ENABLE_BUILD_WITH_CXX),yes) diff --git a/package/gcc/patches/ltmain.patch b/package/gcc/patches/ltmain.patch new file mode 100644 index 000000000..215889b70 --- /dev/null +++ b/package/gcc/patches/ltmain.patch @@ -0,0 +1,12 @@ +diff -Nur gcc-4.5.2.orig/ltmain.sh gcc-4.5.2/ltmain.sh +--- gcc-4.5.2.orig/ltmain.sh 2009-12-05 18:18:53.000000000 +0100 ++++ gcc-4.5.2/ltmain.sh 2011-01-15 14:45:07.000000000 +0100 +@@ -4980,7 +4980,7 @@ + # @file GCC response files + # -tp=* Portland pgcc target processor selection + -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \ +- -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*) ++ -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|-fstack-protector*|-flto) + func_quote_for_eval "$arg" + arg="$func_quote_for_eval_result" + func_append compile_command " $arg" diff --git a/package/gdb/patches/patch-ltmain_sh b/package/gdb/patches/patch-ltmain_sh new file mode 100644 index 000000000..98afcfbc0 --- /dev/null +++ b/package/gdb/patches/patch-ltmain_sh @@ -0,0 +1,11 @@ +--- gdb-7.1.orig/ltmain.sh 2010-01-09 22:11:32.000000000 +0100 ++++ gdb-7.1/ltmain.sh 2011-01-15 18:15:38.000000000 +0100 +@@ -4980,7 +4980,7 @@ func_mode_link () + # @file GCC response files + # -tp=* Portland pgcc target processor selection + -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \ +- -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*) ++ -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|-fstack-protector*|-flto) + func_quote_for_eval "$arg" + arg="$func_quote_for_eval_result" + func_append compile_command " $arg" diff --git a/package/gdk-pixbuf/Makefile b/package/gdk-pixbuf/Makefile index f1eedeeb1..24b55275c 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 libtiff PKG_SECTION:= libs PKG_SITES:= http://ftp.gnome.org/pub/gnome/sources/gdk-pixbuf/2.23/ diff --git a/package/gdk-pixbuf/patches/patch-ltmain_sh b/package/gdk-pixbuf/patches/patch-ltmain_sh new file mode 100644 index 000000000..058119f49 --- /dev/null +++ b/package/gdk-pixbuf/patches/patch-ltmain_sh @@ -0,0 +1,11 @@ +--- gdk-pixbuf-2.23.0.orig/ltmain.sh 2010-12-06 15:06:25.000000000 +0100 ++++ gdk-pixbuf-2.23.0/ltmain.sh 2011-01-14 23:45:56.000000000 +0100 +@@ -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*|@*|-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/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..e8284a680 --- /dev/null +++ b/package/gettext/patches/patch-build-aux_ltmain_sh @@ -0,0 +1,39 @@ +--- 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-14 12:26:11.000000000 +0100 +@@ -4901,7 +4901,7 @@ func_mode_link () + # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC + # @file GCC response files + -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) + func_quote_for_eval "$arg" + arg="$func_quote_for_eval_result" + func_append compile_command " $arg" +@@ -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/gkrellmd/Makefile b/package/gkrellm/Makefile index 2f2548ca6..1b4a6b118 100644 --- a/package/gkrellmd/Makefile +++ b/package/gkrellm/Makefile @@ -3,7 +3,7 @@ include ${TOPDIR}/rules.mk -PKG_NAME:= gkrellmd +PKG_NAME:= gkrellm PKG_VERSION:= 2.3.4 PKG_RELEASE:= 1 PKG_MD5SUM:= 600f4daa395112ed19a3633deb0829ff @@ -14,12 +14,11 @@ PKG_BUILDDEP:= glib PKG_URL:= http://members.dslextreme.com/users/billw/gkrellm/gkrellm.html PKG_SITES:= http://members.dslextreme.com/users/billw/gkrellm/ -DISTFILES:= gkrellm-${PKG_VERSION}.tar.gz -WRKDIST= ${WRKDIR}/gkrellm-${PKG_VERSION}/server +WRKSRC= ${WRKDIR}/gkrellm-${PKG_VERSION}/server include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,GKRELLMD,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +$(eval $(call PKG_template,GKRELLMD,gkrellmd,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) CONFIG_STYLE:= manual INSTALL_STYLE:= manual diff --git a/package/gkrellmd/files/gkrellmd.init b/package/gkrellm/files/gkrellmd.init index 54c42665c..54c42665c 100644 --- a/package/gkrellmd/files/gkrellmd.init +++ b/package/gkrellm/files/gkrellmd.init diff --git a/package/gkrellmd/files/gkrellmd.postinst b/package/gkrellm/files/gkrellmd.postinst index 56b7b06cc..56b7b06cc 100644 --- a/package/gkrellmd/files/gkrellmd.postinst +++ b/package/gkrellm/files/gkrellmd.postinst diff --git a/package/gkrellm/patches/patch-server_Makefile b/package/gkrellm/patches/patch-server_Makefile new file mode 100644 index 000000000..9f070e275 --- /dev/null +++ b/package/gkrellm/patches/patch-server_Makefile @@ -0,0 +1,22 @@ +--- gkrellm-2.3.4.orig/server/Makefile 2008-10-03 23:52:48.000000000 +0200 ++++ gkrellm-2.3.4/server/Makefile 2011-01-15 18:37:40.000000000 +0100 +@@ -26,7 +26,7 @@ SMANDIR ?= $(INSTALLROOT)/share/man/man1 + MANMODE ?= 644 + MANDIRMODE ?= 755 + INSTALL ?= install +-LINK_FLAGS ?= -Wl,-E ++LINK_FLAGS ?= -Wl,-E $(LDFLAGS) + EXTRAOBJS = + + SHARED_PATH = ../shared +@@ -109,8 +109,8 @@ endif + + override CC += -Wall $(FLAGS) + +-OS_NAME=$(shell uname -s) +-OS_RELEASE=$(shell uname -r) ++OS_NAME=Linux ++OS_RELEASE=2.6 + + OBJS = main.o monitor.o mail.o plugins.o glib.o utils.o sysdeps-unix.o log.o + diff --git a/package/glib/Makefile b/package/glib/Makefile index c8ae30715..8dc9c6339 100644 --- a/package/glib/Makefile +++ b/package/glib/Makefile @@ -25,8 +25,8 @@ $(eval $(call PKG_template,GLIB,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_ CONFIGURE_ARGS+= --enable-debug=no \ --disable-mem-pools \ --disable-rebuilds \ - --with-libiconv=gnu \ --disable-fam \ + --with-libiconv=gnu \ --with-threads=posix CONFIGURE_ENV+= glib_cv_long_long_format=ll \ glib_cv_stack_grows=no \ @@ -35,6 +35,22 @@ CONFIGURE_ENV+= glib_cv_long_long_format=ll \ ac_cv_func_posix_getpwuid_r=yes \ ac_cv_func_posix_getgrgid_r=yes +pre-configure: +ifneq ($(OStype),Darwin) + (cd ${WRKBUILD}; rm -rf config.{cache,status}; \ + ./configure --prefix=$(STAGING_HOST_DIR) \ + --enable-debug=no \ + --with-threads=posix \ + ); + ${MAKE} -C ${WRKBUILD}/glib + ${MAKE} -C ${WRKBUILD}/gthread + env CFLAGS="-static" LDFLAGS="-static" ${MAKE} -C ${WRKBUILD}/gio glib-compile-schemas + env CFLAGS="-static" LDFLAGS="-static" ${MAKE} -C ${WRKBUILD}/gobject glib-genmarshal + $(CP) ${WRKBUILD}/gio/glib-compile-schemas ${STAGING_HOST_DIR}/bin + $(CP) ${WRKBUILD}/gobject/.libs/glib-genmarshal ${STAGING_HOST_DIR}/bin + ${MAKE} -C ${WRKBUILD} clean +endif + post-install: ${INSTALL_DIR} ${IDIR_GLIB}/usr/lib ${CP} ${WRKINST}/usr/lib/libgio*.so* ${IDIR_GLIB}/usr/lib diff --git a/package/glib/patches/patch-glib_gconvert_c b/package/glib/patches/patch-glib_gconvert_c new file mode 100644 index 000000000..bd9db0404 --- /dev/null +++ b/package/glib/patches/patch-glib_gconvert_c @@ -0,0 +1,16 @@ +--- glib-2.27.5.orig/glib/gconvert.c 2010-09-13 15:40:53.000000000 +0200 ++++ glib-2.27.5/glib/gconvert.c 2011-01-14 17:17:40.000000000 +0100 +@@ -58,13 +58,6 @@ + + #include "glibintl.h" + +-#if defined(USE_LIBICONV_GNU) && !defined (_LIBICONV_H) +-#error GNU libiconv in use but included iconv.h not from libiconv +-#endif +-#if !defined(USE_LIBICONV_GNU) && defined (_LIBICONV_H) +-#error GNU libiconv not in use but included iconv.h is from libiconv +-#endif +- + + /** + * SECTION:conversions diff --git a/package/glib/patches/patch-ltmain_sh b/package/glib/patches/patch-ltmain_sh new file mode 100644 index 000000000..559afa25c --- /dev/null +++ b/package/glib/patches/patch-ltmain_sh @@ -0,0 +1,11 @@ +--- glib-2.27.5.orig/ltmain.sh 2010-12-06 15:06:25.000000000 +0100 ++++ glib-2.27.5/ltmain.sh 2011-01-14 17:22:21.000000000 +0100 +@@ -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*|@*|-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/package/glibc/Makefile b/package/glibc/Makefile index 8b4584373..9d890c18b 100644 --- a/package/glibc/Makefile +++ b/package/glibc/Makefile @@ -20,16 +20,28 @@ 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) \ - $(IDIR_GLIBC)/etc/localtime + 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_GLIBC}/; \ + done + tz=; cd ${IDIR_GLIBC}/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_GLIBC}/etc/localtime; \ + fi + ${CP} ${STAGING_TARGET_DIR}/etc/gai.conf ${IDIR_GLIBC}/etc/ + ${CP} ${STAGING_TARGET_DIR}/etc/nscd.conf ${IDIR_GLIBC}/etc/ + ${CP} ${STAGING_TARGET_DIR}/etc/nsswitch.conf ${IDIR_GLIBC}/etc/ $(CP) $(STAGING_TARGET_DIR)/lib/ld*.so* $(IDIR_GLIBC)/lib/ -for file in libc libcrypt libdl libm libresolv librt libutil libnss_compat libnss_dns libnss_files; do \ $(CP) $(STAGING_TARGET_DIR)/lib/$$file.so* $(IDIR_GLIBC)/lib/; \ diff --git a/package/gmp/patches/patch-ltmain_sh b/package/gmp/patches/patch-ltmain_sh new file mode 100644 index 000000000..c3acfc351 --- /dev/null +++ b/package/gmp/patches/patch-ltmain_sh @@ -0,0 +1,11 @@ +--- gmp-4.3.2.orig/ltmain.sh 2010-01-07 21:09:02.000000000 +0100 ++++ gmp-4.3.2/ltmain.sh 2011-01-15 14:17:38.000000000 +0100 +@@ -1663,7 +1663,7 @@ EOF + # -F/path gives path to uninstalled frameworks, gcc on darwin + # @file GCC response files + -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) + + # Unknown arguments in both finalize_command and compile_command need + # to be aesthetically quoted because they are evaled later. 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/gnutls/Makefile b/package/gnutls/Makefile index 7a289205e..e75ae7f9f 100644 --- a/package/gnutls/Makefile +++ b/package/gnutls/Makefile @@ -33,6 +33,7 @@ $(eval $(call PKG_template,LIBGNUTLS_OPENSSL,libgnutls-openssl,${PKG_VERSION}-${ CONFIGURE_ARGS+= --without-libopencdk-prefix \ --disable-camellia \ --with-libgcrypt-prefix=${STAGING_TARGET_DIR}/usr \ + --disable-rpath \ --without-libz-prefix post-install: diff --git a/package/gnutls/patches/patch-build-aux_ltmain_sh b/package/gnutls/patches/patch-build-aux_ltmain_sh new file mode 100644 index 000000000..564eeb34b --- /dev/null +++ b/package/gnutls/patches/patch-build-aux_ltmain_sh @@ -0,0 +1,11 @@ +--- gnutls-2.8.6.orig/build-aux/ltmain.sh 2010-03-15 11:28:59.000000000 +0100 ++++ gnutls-2.8.6/build-aux/ltmain.sh 2011-01-15 19:40:55.000000000 +0100 +@@ -4765,7 +4765,7 @@ func_mode_link () + # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC + # @file GCC response files + -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) + func_quote_for_eval "$arg" + arg="$func_quote_for_eval_result" + func_append compile_command " $arg" diff --git a/package/gnutls/patches/patch-lib_build-aux_ltmain_sh b/package/gnutls/patches/patch-lib_build-aux_ltmain_sh new file mode 100644 index 000000000..e16ccadeb --- /dev/null +++ b/package/gnutls/patches/patch-lib_build-aux_ltmain_sh @@ -0,0 +1,11 @@ +--- gnutls-2.8.6.orig/lib/build-aux/ltmain.sh 2010-03-15 11:28:24.000000000 +0100 ++++ gnutls-2.8.6/lib/build-aux/ltmain.sh 2011-01-15 19:44:32.000000000 +0100 +@@ -4765,7 +4765,7 @@ func_mode_link () + # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC + # @file GCC response files + -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) + func_quote_for_eval "$arg" + arg="$func_quote_for_eval_result" + func_append compile_command " $arg" diff --git a/package/gnutls/patches/patch-libextra_build-aux_ltmain_sh b/package/gnutls/patches/patch-libextra_build-aux_ltmain_sh new file mode 100644 index 000000000..75df0e2d6 --- /dev/null +++ b/package/gnutls/patches/patch-libextra_build-aux_ltmain_sh @@ -0,0 +1,11 @@ +--- gnutls-2.8.6.orig/libextra/build-aux/ltmain.sh 2010-03-15 11:28:49.000000000 +0100 ++++ gnutls-2.8.6/libextra/build-aux/ltmain.sh 2011-01-15 19:44:14.000000000 +0100 +@@ -4765,7 +4765,7 @@ func_mode_link () + # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC + # @file GCC response files + -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) + func_quote_for_eval "$arg" + arg="$func_quote_for_eval_result" + func_append compile_command " $arg" diff --git a/package/gpm/patches/patch-src_Makefile_in b/package/gpm/patches/patch-src_Makefile_in new file mode 100644 index 000000000..3957260ae --- /dev/null +++ b/package/gpm/patches/patch-src_Makefile_in @@ -0,0 +1,51 @@ +--- gpm-1.20.6.orig/src/Makefile.in 2009-02-09 10:58:53.000000000 +0100 ++++ gpm-1.20.6/src/Makefile.in 2011-01-11 16:48:43.000000000 +0100 +@@ -59,19 +59,19 @@ STRIP = -s + + # the prog rules are not very clean... + prog/%.o: prog/%.c +- $(CC) -Iheaders @CPPFLAGS@ $(CPPFLAGS) @CFLAGS@ $(CFLAGS) -c -o $@ $< ++ $(CC) -Iheaders @CPPFLAGS@ @CFLAGS@ -c -o $@ $< + + prog/%: prog/%.o +- $(CC) @LDFLAGS@ $(LDFLAGS) -o $@ $^ @LIBS@ $(LIBS) ++ $(CC) @LDFLAGS@ -o $@ $^ @LIBS@ + + %.o: %.c +- $(CC) @CPPFLAGS@ $(CPPFLAGS) @CFLAGS@ $(CFLAGS) -c -o $@ $< ++ $(CC) @CPPFLAGS@ @CFLAGS@ -c -o $@ $< + + %.lo: %.c +- $(CC) @CPPFLAGS@ $(CPPFLAGS) @PICFLAGS@ @CFLAGS@ $(CFLAGS) -c -o $@ $< ++ $(CC) @CPPFLAGS@ @PICFLAGS@ @CFLAGS@ -c -o $@ $< + + %: %.o +- $(CC) @LDFLAGS@ $(LDFLAGS) -o $@ $^ @LIBS@ $(LIBS) ++ $(CC) @LDFLAGS@ -o $@ $^ @LIBS@ + + # old, unused, but good rule [dependings] + #%.d: $(srcdir)/%.c +@@ -82,7 +82,7 @@ prog/%: prog/%.o + all: gpm lib/libgpm.so.@abi_lev@ lib/libgpm.a $(PROG) + + gpm: $(GOBJ) +- $(CC) @LDFLAGS@ $(LDFLAGS) -o $@ $(GOBJ) @LIBS@ $(LIBS) -lm ++ $(CC) @LDFLAGS@ -o $@ $(GOBJ) @LIBS@ -lm + + # construct dependings of sourcefiles and link sourcefiles + $(DEPFILE) dep: prog/gpm-root.c +@@ -148,11 +148,11 @@ prog/gpm-root.c: $(srcdir)/prog/gpm-root + + # gpm-root needs an own rule, because gpm-root.c is not in $(srcdir) + prog/gpm-root: prog/gpm-root.c lib/libgpm.so.@abi_lev@ +- $(CC) -I. @CPPFLAGS@ $(CPPFLAGS) @CFLAGS@ $(CFLAGS) -c -o $@.o $< +- $(CC) @LDFLAGS@ $(LDFLAGS) -o $@ $@.o @LIBS@ $(LIBS) lib/libgpm.so.@abi_lev@ ++ $(CC) -I. @CPPFLAGS@ @CFLAGS@ -c -o $@.o $< ++ $(CC) @LDFLAGS@ -o $@ $@.o @LIBS@ lib/libgpm.so.@abi_lev@ + + prog/mouse-test: prog/mouse-test.o mice.o twiddler.o synaptics.o prog/open_console.o +- $(CC) @LDFLAGS@ $(LDFLAGS) -o $@ $^ @LIBS@ $(LIBS) -lm ++ $(CC) @LDFLAGS@ -o $@ $^ @LIBS@ -lm + + $(PROG): lib/libgpm.so.@abi_lev@ + diff --git a/package/gpsd/Makefile b/package/gpsd/Makefile index 83fac860b..24536e5c1 100644 --- a/package/gpsd/Makefile +++ b/package/gpsd/Makefile @@ -14,6 +14,7 @@ PKG_BUILDDEP:= ncurses PKG_SITES:= http://download.berlios.de/gpsd/ PKG_URL:= http://gpsd.berlios.de/ PKG_CXX:= GPSD +PKG_NEED_CXX:= 1 PKG_SUBPKGS:= GPSD GPSD_CLIENTS PKGSD_GPSD_CLIENTS:= GPS client utilities @@ -31,10 +32,15 @@ CONFIGURE_ENV+= EGREP="grep -E" \ CONFIGURE_ARGS+= --disable-dbus TCFLAGS+= -fPIC +LIBRARIES:=-nodefaultlibs -luClibc++ +ifeq ($(ADK_TOOLCHAIN_GCC_USE_SSP),y) +LIBRARIES+=-lssp -lssp_nonshared +endif + ifeq ($(ADK_COMPILE_GPSD_WITH_UCLIBCXX),y) -TCXXFLAGS+= -fno-builtin -fno-rtti -nostdinc++ \ +TCXXFLAGS+= -fno-rtti -nostdinc++ \ -I${STAGING_TARGET_DIR}/usr/include/uClibc++ -TLDFLAGS+= -luClibc++ -lc -lm -pthread -nodefaultlibs +TLDFLAGS+= $(LIBRARIES) else TLDFLAGS+= -shared -pthread endif diff --git a/package/gpsd/patches/patch-Makefile_in b/package/gpsd/patches/patch-Makefile_in index bd45358ee..b54aabbac 100644 --- a/package/gpsd/patches/patch-Makefile_in +++ b/package/gpsd/patches/patch-Makefile_in @@ -1,5 +1,5 @@ --- gpsd-2.95.orig/Makefile.in 2010-07-14 00:48:24.000000000 +0200 -+++ gpsd-2.95/Makefile.in 2010-07-30 13:04:19.000000000 +0200 ++++ gpsd-2.95/Makefile.in 2011-01-15 19:56:22.000000000 +0100 @@ -612,8 +612,8 @@ libgps_la_SOURCES = $(libgps_c_sources) libgpsd_la_SOURCES = $(libgpsd_c_sources) $(libgpsd_h_sources) \ driver_rtcm2.h packet_states.h @@ -11,3 +11,12 @@ nodist_libgpsd_la_SOURCES = packet_names.h ais_json.i libgps_la_LIBADD = $(LIBM) $(LIBC) $(LIBNSL) $(LIBSOCKET) $(LIBPTHREAD) libgpsd_la_LIBADD = $(LIBM) $(LIBC) $(LIBNSL) $(LIBSOCKET) $(LIBPTHREAD) $(BLUEZ_LIBS) libgps.la +@@ -996,7 +996,7 @@ clean-libLTLIBRARIES: + rm -f "$${dir}/so_locations"; \ + done + libgps.la: $(libgps_la_OBJECTS) $(libgps_la_DEPENDENCIES) +- $(libgps_la_LINK) -rpath $(libdir) $(libgps_la_OBJECTS) $(libgps_la_LIBADD) $(LIBS) ++ $(libgps_la_LINK) -rpath $(libdir) $(libgps_la_OBJECTS) $(libgps_la_LIBADD) $(LDFLAGS) $(LIBS) + libgpsd.la: $(libgpsd_la_OBJECTS) $(libgpsd_la_DEPENDENCIES) + $(LINK) -rpath $(libdir) $(libgpsd_la_OBJECTS) $(libgpsd_la_LIBADD) $(LIBS) + install-binPROGRAMS: $(bin_PROGRAMS) diff --git a/package/gpsd/patches/patch-ltmain_sh b/package/gpsd/patches/patch-ltmain_sh new file mode 100644 index 000000000..85a07afac --- /dev/null +++ b/package/gpsd/patches/patch-ltmain_sh @@ -0,0 +1,20 @@ +--- gpsd-2.95.orig/ltmain.sh 2010-06-18 22:54:26.000000000 +0200 ++++ gpsd-2.95/ltmain.sh 2011-01-15 20:23:12.000000000 +0100 +@@ -4765,7 +4765,7 @@ func_mode_link () + # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC + # @file GCC response files + -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) + func_quote_for_eval "$arg" + arg="$func_quote_for_eval_result" + func_append compile_command " $arg" +@@ -4963,7 +4963,7 @@ func_mode_link () + done + + if test "$linkmode" = lib; then +- libs="$predeps $libs $compiler_lib_search_path $postdeps" ++ libs="$libs $compiler_lib_search_path" + + # Compute libraries that are listed more than once in $predeps + # $postdeps and mark them as special (i.e., whose duplicates are diff --git a/package/grep/Makefile b/package/grep/Makefile index d608bd8be..d9fc4d56c 100644 --- a/package/grep/Makefile +++ b/package/grep/Makefile @@ -9,8 +9,10 @@ PKG_RELEASE:= 2 PKG_MD5SUM:= 92258031d98d4f12dfc6a6d24057e672 PKG_DESCR:= global search for a regular expression and print out matched lines PKG_SECTION:= utils +PKG_BUILDDEP:= pcre PKG_URL:= http://www.gnu.org/software/grep/ PKG_SITES:= ftp://ftp.gnu.org/gnu/grep/ +PKG_NOPARALLEL:= 1 include $(TOPDIR)/mk/package.mk 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/gtk+/patches/patch-ltmain_sh b/package/gtk+/patches/patch-ltmain_sh new file mode 100644 index 000000000..2d17e2538 --- /dev/null +++ b/package/gtk+/patches/patch-ltmain_sh @@ -0,0 +1,11 @@ +--- gtk+-2.22.1.orig/ltmain.sh 2010-08-13 04:09:38.000000000 +0200 ++++ gtk+-2.22.1/ltmain.sh 2011-01-14 23:50:15.000000000 +0100 +@@ -5091,7 +5091,7 @@ func_mode_link () + # @file GCC response files + # -tp=* Portland pgcc target processor selection + -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \ +- -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*) ++ -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|-fstack-protector*|-flto) + func_quote_for_eval "$arg" + arg="$func_quote_for_eval_result" + func_append compile_command " $arg" diff --git a/package/hdparm/patches/patch-Makefile b/package/hdparm/patches/patch-Makefile index 03c74f509..616b9fccc 100644 --- a/package/hdparm/patches/patch-Makefile +++ b/package/hdparm/patches/patch-Makefile @@ -1,32 +1,36 @@ --- hdparm-9.15.orig/Makefile 2008-12-10 01:14:28.000000000 +0100 -+++ hdparm-9.15/Makefile 2010-02-13 12:24:25.000000000 +0100 -@@ -13,7 +13,7 @@ oldmandir = $(manprefix)/man ++++ hdparm-9.15/Makefile 2011-01-15 20:46:42.000000000 +0100 +@@ -13,10 +13,10 @@ oldmandir = $(manprefix)/man CC ?= gcc STRIP ?= strip - + -CFLAGS := -O2 -W -Wall -Wbad-function-cast -Wcast-align -Wpointer-arith -Wcast-qual -Wshadow -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -fkeep-inline-functions -Wwrite-strings -Waggregate-return -Wnested-externs -Wtrigraphs $(CFLAGS) +CFLAGS ?= -O2 -W -Wall -Wbad-function-cast -Wcast-align -Wpointer-arith -Wcast-qual -Wshadow -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -fkeep-inline-functions -Wwrite-strings -Waggregate-return -Wnested-externs -Wtrigraphs $(CFLAGS) - + #LDFLAGS = -s -static - LDFLAGS = -s +-LDFLAGS = -s ++LDFLAGS ?= -s + INSTALL = install + INSTALL_DATA = $(INSTALL) -m 644 + INSTALL_DIR = $(INSTALL) -m 755 -d @@ -28,7 +28,6 @@ all: hdparm - + hdparm: hdparm.h sgio.h $(OBJS) $(CC) $(LDFLAGS) -o hdparm $(OBJS) - $(STRIP) hdparm - + hdparm.o: hdparm.h sgio.h - + @@ -46,9 +45,9 @@ install: all hdparm.8 - if [ -f $(DESTDIR)$(sbindir)/hdparm ]; then rm -f $(DESTDIR)$(sbindir)/hdparm ; fi - if [ -f $(DESTDIR)$(mandir)/man8/hdparm.8 ]; then rm -f $(DESTDIR)$(mandir)/man8/hdparm.8 ;\ - elif [ -f $(DESTDIR)$(oldmandir)/man8/hdparm.8 ]; then rm -f $(DESTDIR)$(oldmandir)/man8/hdparm.8 ; fi + if [ -f $(DESTDIR)$(sbindir)/hdparm ]; then rm -f $(DESTDIR)$(sbindir)/hdparm ; fi + if [ -f $(DESTDIR)$(mandir)/man8/hdparm.8 ]; then rm -f $(DESTDIR)$(mandir)/man8/hdparm.8 ;\ + elif [ -f $(DESTDIR)$(oldmandir)/man8/hdparm.8 ]; then rm -f $(DESTDIR)$(oldmandir)/man8/hdparm.8 ; fi - $(INSTALL_PROGRAM) -D hdparm $(DESTDIR)$(sbindir)/hdparm - if [ -d $(DESTDIR)$(mandir) ]; then $(INSTALL_DATA) -D hdparm.8 $(DESTDIR)$(mandir)/man8/hdparm.8 ;\ - elif [ -d $(DESTDIR)$(oldmandir) ]; then $(INSTALL_DATA) -D hdparm.8 $(DESTDIR)$(oldmandir)/man8/hdparm.8 ; fi + $(INSTALL_PROGRAM) hdparm $(DESTDIR)$(sbindir)/hdparm + if [ -d $(DESTDIR)$(mandir) ]; then $(INSTALL_DATA) hdparm.8 $(DESTDIR)$(mandir)/man8/hdparm.8 ;\ + elif [ -d $(DESTDIR)$(oldmandir) ]; then $(INSTALL_DATA) hdparm.8 $(DESTDIR)$(oldmandir)/man8/hdparm.8 ; fi - + clean: - -rm -f hdparm $(OBJS) core 2>/dev/null + -rm -f hdparm $(OBJS) core 2>/dev/null diff --git a/package/heimdal/Makefile b/package/heimdal/Makefile index ca7f3e93c..9568237e0 100644 --- a/package/heimdal/Makefile +++ b/package/heimdal/Makefile @@ -5,34 +5,32 @@ include $(TOPDIR)/rules.mk PKG_NAME:= heimdal PKG_VERSION:= 1.4 -PKG_RELEASE:= 1 +PKG_RELEASE:= 2 PKG_MD5SUM:= 31d08bbf47a77827fe97ef3f52b4c9c4 PKG_DESCR:= Kerberos 5 server PKG_SECTION:= crypto -PKG_DEPENDS:= libheimdal libheimdal-client libncurses libcom-err -PKG_BUILDDEP:= openssl ncurses e2fsprogs +PKG_DEPENDS:= libheimdal libheimdal-client libncurses libcom-err libreadline +PKG_BUILDDEP:= openssl ncurses e2fsprogs readline PKG_URL:= http://www.h5l.org/ PKG_SITES:= http://www.h5l.org/dist/src/ PKG_NOPARALLEL:= 1 -PKG_HOST_DEPENDS:= !darwin - PKG_SUBPKGS:= HEIMDAL LIBHEIMDAL LIBHEIMDAL_CLIENT PKGSD_LIBHEIMDAL:= Kerberos 5 server libraries PKGSC_LIBHEIMDAL:= libs PKGSD_LIBHEIMDAL_CLIENT:= Kerberos 5 client libraries PKGSC_LIBHEIMDAL_CLIENT:= libs -PKG_FLAVOURS:= PKINIT -PKGFD_PKINIT:= Enable PK-INIT +PKG_FLAVOURS_HEIMDAL_SERVER:= WITH_PKINIT +PKGFD_WITH_PKINIT: Enable PK-INIT -PKG_CHOICES:= WITH_LDAP WITH_BDB -PKGCD_WITH_LDAP:= use OpenLDAP as database backend -PKGCS_WITH_LDAP:= libopenldap -PKGCB_WITH_LDAP:= openldap -PKGCD_WITH_BDB:= use Berkeley DB as database backend -PKGCS_WITH_BDB:= libdb -PKGCB_WITH_BDB:= libdb +PKG_CHOICES_HEIMDAL_SERVER:= WITH_LDAP WITH_BDB +PKGCD_WITH_LDAP:= use OpenLDAP as database backend +PKGCS_WITH_LDAP:= libopenldap +PKGCB_WITH_LDAP:= openldap +PKGCD_WITH_BDB:= use Berkeley DB as database backend +PKGCS_WITH_BDB:= libdb +PKGCB_WITH_BDB:= libdb include $(TOPDIR)/mk/package.mk @@ -45,16 +43,18 @@ CONFIGURE_OPTS:= --with-hdbdir=/etc/heimdal \ --disable-ndbm-db \ --libdir=/usr/lib/heimdal \ --libexecdir=/usr/sbin \ + --with-openssl=${STAGING_TARGET_DIR}/usr \ + --with-readline=${STAGING_TARGET_DIR}/usr \ --with-ipv6 \ --sysconfdir=/etc/heimdal -ifeq ($(ADK_COMPILE_HEIMDAL_WITH_BDB),y) -CONFIGURE_ARGS+= --enable-berkeley-db +ifeq ($(ADK_PACKAGE_HEIMDAL_SERVER_WITH_BDB),y) +CONFIGURE_ARGS+= --with-berkeley-db else -CONFIGURE_ARGS+= --disable-berkeley-db +CONFIGURE_ARGS+= --without-berkeley-db endif -ifeq ($(ADK_COMPILE_HEIMDAL_WITH_LDAP),y) +ifeq ($(ADK_PACKAGE_HEIMDAL_SERVER_WITH_LDAP),y) CONFIGURE_ARGS+= --with-openldap=yes CONFIGURE_ARGS+= --with-openldap-include=${STAGING_TARGET_DIR}/usr CONFIGURE_ARGS+= --with-openldap-lib=${STAGING_TARGET_DIR}/usr @@ -62,10 +62,11 @@ else CONFIGURE_ARGS+= --without-openldap endif -ifeq ($(ADK_PACKAGE_HEIMDAL_PKINIT),y) +ifeq ($(ADK_PACKAGE_HEIMDAL_SERVER_WITH_PKINIT),y) CONFIGURE_OPTS+= --enable-pk-init else -CONFIGURE_OPTS+= --disable-pk-init +CONFIGURE_OPTS+= --disable-pk-init \ + --disable-kx509 endif TCFLAGS+= -I${STAGING_TARGET_DIR}/usr/include/et -pthread @@ -74,29 +75,27 @@ CONFIGURE_ARGS+= ${CONFIGURE_OPTS} --with-cross-tools=${STAGING_HOST_DIR}/bin CONFIGURE_ENV+= cross_compiling=yes \ ac_cv_func_getaddrinfo_numserv=yes -ifeq ($(ADK_HOST_CYGWIN),y) -EXEEXT:= .exe -endif - -pre-configure: +post-extract: (cd ${WRKBUILD}; rm -rf config.{cache,status} ; \ ./configure --prefix=$(STAGING_HOST_DIR) \ --disable-pk-init \ --without-openldap \ + --disable-sqlite-cache \ --disable-otp \ ); ${MAKE} -C ${WRKBUILD}/include ${MAKE} -C ${WRKBUILD}/lib/roken ${MAKE} -C ${WRKBUILD}/lib/vers ${MAKE} -C ${WRKBUILD}/lib/editline - ${MAKE} -C ${WRKBUILD}/lib/asn1 asn1_compile$(EXEEXT) - ${MAKE} -C ${WRKBUILD}/lib/sl slc$(EXEEXT) - ${INSTALL_BIN} ${WRKBUILD}/lib/roken/make-roken$(EXEEXT) \ - ${STAGING_HOST_DIR}/bin - ${INSTALL_BIN} ${WRKBUILD}/lib/sl/slc$(EXEEXT) \ - ${STAGING_HOST_DIR}/bin + env CFLAGS="-static" LDFLAGS="-static" ${MAKE} -C ${WRKBUILD}/lib/com_err compile_et$(EXEEXT) + env CFLAGS="-static" LDFLAGS="-static" ${MAKE} -C ${WRKBUILD}/lib/asn1 asn1_compile$(EXEEXT) + env CFLAGS="-static" LDFLAGS="-static" ${MAKE} -C ${WRKBUILD}/lib/sl slc$(EXEEXT) ${MAKE} -C ${WRKBUILD}/lib/roken install ${MAKE} -C ${WRKBUILD}/lib/asn1 install + ${MAKE} -C ${WRKBUILD}/lib/sl install + $(CP) $(STAGING_HOST_DIR)/libexec/heimdal/{slc,asn1_compile} \ + $(STAGING_HOST_DIR)/bin + ${MAKE} -C ${WRKBUILD}/lib/sl clean ${MAKE} -C ${WRKBUILD}/lib/asn1 clean ${MAKE} -C ${WRKBUILD}/lib/roken clean ${MAKE} -C ${WRKBUILD} clean diff --git a/package/heimdal/patches/patch-Makefile_in b/package/heimdal/patches/patch-Makefile_in new file mode 100644 index 000000000..d1883a559 --- /dev/null +++ b/package/heimdal/patches/patch-Makefile_in @@ -0,0 +1,24 @@ +--- heimdal-1.4.orig/Makefile.in 2010-09-13 09:24:25.000000000 +0200 ++++ heimdal-1.4/Makefile.in 2011-01-12 14:10:53.848658254 +0100 +@@ -114,8 +114,8 @@ AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGE + distdir dist dist-all distcheck + ETAGS = etags + CTAGS = ctags +-DIST_SUBDIRS = include lib kuser kdc admin kadmin kpasswd kcm appl doc \ +- tools tests packages etc po ++DIST_SUBDIRS = include lib kuser kdc admin kadmin kpasswd kcm \ ++ tools packages etc + DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + distdir = $(PACKAGE)-$(VERSION) + top_distdir = $(distdir) +@@ -392,8 +392,8 @@ LIB_kafs = $(top_builddir)/lib/kafs/libk + @KRB5_TRUE@LIB_tsasl = $(top_builddir)/lib/tsasl/libtsasl.la + @DCE_TRUE@LIB_kdfs = $(top_builddir)/lib/kdfs/libkdfs.la + @KCM_TRUE@kcm_dir = kcm +-SUBDIRS = include lib kuser kdc admin kadmin kpasswd $(kcm_dir) appl \ +- doc tools tests packages etc po ++SUBDIRS = include lib kuser kdc admin kadmin kpasswd $(kcm_dir) \ ++ tools packages etc + ACLOCAL_AMFLAGS = -I cf + EXTRA_DIST = \ + TODO \ diff --git a/package/heimdal/patches/patch-configure b/package/heimdal/patches/patch-configure new file mode 100644 index 000000000..29a003f6b --- /dev/null +++ b/package/heimdal/patches/patch-configure @@ -0,0 +1,19 @@ +--- heimdal-1.4.orig/configure 2010-09-13 09:24:11.000000000 +0200 ++++ heimdal-1.4/configure 2011-01-11 18:51:09.154898347 +0100 +@@ -26892,7 +26892,7 @@ rm -fr conftest* + fi + + if test "${krb_cv_compile_et_cross}" = yes ; then +- krb_cv_com_err="cross" ++ krb_cv_com_err="yes" + elif test "${krb_cv_compile_et}" = "yes"; then + krb_cv_save_LIBS="${LIBS}" + LIBS="${LIBS} -lcom_err" +@@ -26928,6 +26928,7 @@ else + krb_cv_com_err="no" + fi + ++krb_cv_com_err="yes" + if test "${krb_cv_com_err}" = "yes"; then + DIR_com_err="" + LIB_com_err="-lcom_err" diff --git a/package/heimdal/patches/patch-kdc_config_c b/package/heimdal/patches/patch-kdc_config_c new file mode 100644 index 000000000..104086102 --- /dev/null +++ b/package/heimdal/patches/patch-kdc_config_c @@ -0,0 +1,18 @@ +--- heimdal-1.4.orig/kdc/config.c 2010-09-13 09:23:34.000000000 +0200 ++++ heimdal-1.4/kdc/config.c 2011-01-12 13:55:17.454913780 +0100 +@@ -347,6 +347,7 @@ configure(krb5_context context, int argc + + #endif + ++#ifdef PKINIT + if (config->enable_pkinit) { + if (config->pkinit_kdc_identity == NULL) + krb5_errx(context, 1, "pkinit enabled but no identity"); +@@ -361,6 +362,7 @@ configure(krb5_context context, int argc + config->pkinit_kdc_revoke); + + } ++#endif + + return config; + } diff --git a/package/heimdal/patches/patch-kdc_kdc-replay_c b/package/heimdal/patches/patch-kdc_kdc-replay_c new file mode 100644 index 000000000..504e4962f --- /dev/null +++ b/package/heimdal/patches/patch-kdc_kdc-replay_c @@ -0,0 +1,18 @@ +--- heimdal-1.4.orig/kdc/kdc-replay.c 2010-09-13 09:23:34.000000000 +0200 ++++ heimdal-1.4/kdc/kdc-replay.c 2011-01-12 14:08:08.048658301 +0100 +@@ -86,6 +86,7 @@ main(int argc, char **argv) + if (ret) + krb5_err(context, 1, ret, "krb5_kdc_set_dbinfo"); + ++#ifdef PKINIT + if (config->enable_pkinit) { + if (config->pkinit_kdc_identity == NULL) + krb5_errx(context, 1, "pkinit enabled but no identity"); +@@ -100,6 +101,7 @@ main(int argc, char **argv) + config->pkinit_kdc_revoke); + + } ++#endif + + if (argc != 2) + errx(1, "argc != 2"); diff --git a/package/heimdal/patches/patch-lib_hcrypto_Makefile_in b/package/heimdal/patches/patch-lib_hcrypto_Makefile_in new file mode 100644 index 000000000..fb16d3504 --- /dev/null +++ b/package/heimdal/patches/patch-lib_hcrypto_Makefile_in @@ -0,0 +1,12 @@ +--- heimdal-1.4.orig/lib/hcrypto/Makefile.in 2010-09-13 09:24:20.000000000 +0200 ++++ heimdal-1.4/lib/hcrypto/Makefile.in 2011-01-11 20:11:30.955611146 +0100 +@@ -716,6 +716,9 @@ imathsource = \ + imath/iprime.h + + ltmsources = \ ++ libtommath/tommath.h \ ++ libtommath/tommath_class.h \ ++ libtommath/tommath_superclass.h \ + libtommath/bncore.c \ + libtommath/bn_mp_init.c \ + libtommath/bn_mp_clear.c \ diff --git a/package/heimdal/patches/patch-lib_roken_Makefile_in.orig b/package/heimdal/patches/patch-lib_roken_Makefile_in.orig deleted file mode 100644 index 7d207e474..000000000 --- a/package/heimdal/patches/patch-lib_roken_Makefile_in.orig +++ /dev/null @@ -1,27 +0,0 @@ ---- heimdal-1.4.orig/lib/roken/Makefile.in 2010-09-13 09:24:23.000000000 +0200 -+++ heimdal-1.4/lib/roken/Makefile.in 2010-11-10 18:57:00.174995995 +0100 -@@ -1977,18 +1977,13 @@ $(LTLIBOBJS) $(libroken_la_OBJECTS): rok - .hin.h: - cp $< $@ - --@CROSS_COMPILE_FALSE@roken.h: make-roken$(EXEEXT) --@CROSS_COMPILE_FALSE@ @./make-roken$(EXEEXT) > tmp.h ;\ --@CROSS_COMPILE_FALSE@ if [ -f roken.h ] && cmp -s tmp.h roken.h ; then rm -f tmp.h ; \ --@CROSS_COMPILE_FALSE@ else rm -f roken.h; mv tmp.h roken.h; fi -- --@CROSS_COMPILE_FALSE@make-roken.c: roken.h.in roken.awk --@CROSS_COMPILE_FALSE@ $(AWK) -f $(srcdir)/roken.awk $(srcdir)/roken.h.in > make-roken.c -+roken.h: make-roken$(EXEEXT) -+ ./make-roken$(EXEEXT) > tmp.h ;\ -+ if [ -f roken.h ] && cmp -s tmp.h roken.h ; then rm -f tmp.h ; \ -+ else rm -f roken.h; mv tmp.h roken.h; fi - --@CROSS_COMPILE_TRUE@roken.h: $(top_srcdir)/cf/roken-h-process.pl roken.h.in --@CROSS_COMPILE_TRUE@ perl $(top_srcdir)/cf/roken-h-process.pl \ --@CROSS_COMPILE_TRUE@ -c $(top_builddir)/include/config.h \ --@CROSS_COMPILE_TRUE@ -p $(srcdir)/roken.h.in -o roken.h -+make-roken.c: roken.h.in roken.awk -+ $(AWK) -f $(srcdir)/roken.awk $(srcdir)/roken.h.in > make-roken.c - - # Tell versions [3.59,3.63) of GNU make to not export all variables. - # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/package/heimdal/patches/patch-lib_roken_roken_h_in b/package/heimdal/patches/patch-lib_roken_roken_h_in deleted file mode 100644 index 59e9a2c52..000000000 --- a/package/heimdal/patches/patch-lib_roken_roken_h_in +++ /dev/null @@ -1,11 +0,0 @@ ---- heimdal-1.4.orig/lib/roken/roken.h.in 2010-09-13 09:23:34.000000000 +0200 -+++ heimdal-1.4/lib/roken/roken.h.in 2010-11-10 19:46:45.916683899 +0100 -@@ -524,7 +524,7 @@ ROKEN_LIB_FUNCTION int ROKEN_LIB_CALL ge - ROKEN_LIB_FUNCTION char * ROKEN_LIB_CALL strerror(int); - #endif - --#if (!defined(HAVE_STRERROR_R) && !defined(strerror_r)) || (!defined(STRERROR_R_PROTO_COMPATIBLE) && defined(HAVE_STRERROR_R)) -+#if ( !defined(HAVE_STRERROR_R) && !defined(strerror_r)) || (!defined(STRERROR_R_PROTO_COMPATIBLE) && defined(HAVE_STRERROR_R)) - int ROKEN_LIB_FUNCTION rk_strerror_r(int, char *, size_t); - #else - #define rk_strerror_r strerror_r diff --git a/package/heimdal/patches/patch-ltmain_sh b/package/heimdal/patches/patch-ltmain_sh new file mode 100644 index 000000000..fcf6dad2c --- /dev/null +++ b/package/heimdal/patches/patch-ltmain_sh @@ -0,0 +1,11 @@ +--- heimdal-1.4.orig/ltmain.sh 2010-09-13 09:24:01.000000000 +0200 ++++ heimdal-1.4/ltmain.sh 2011-01-15 20:52:41.000000000 +0100 +@@ -4238,7 +4238,7 @@ func_mode_link () + # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC + # @file GCC response files + -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) + func_quote_for_eval "$arg" + arg="$func_quote_for_eval_result" + func_append compile_command " $arg" diff --git a/package/heimdal/src/lib/hcrypto/libtommath/tommath.h b/package/heimdal/src/lib/hcrypto/libtommath/tommath.h new file mode 100644 index 000000000..426207a29 --- /dev/null +++ b/package/heimdal/src/lib/hcrypto/libtommath/tommath.h @@ -0,0 +1,592 @@ +/* LibTomMath, multiple-precision integer library -- Tom St Denis + * + * LibTomMath is a library that provides multiple-precision + * integer arithmetic as well as number theoretic functionality. + * + * The library was designed directly after the MPI library by + * Michael Fromberger but has been written from scratch with + * additional optimizations in place. + * + * The library is free for all purposes without any express + * guarantee it works. + * + * Tom St Denis, tomstdenis@gmail.com, http://math.libtomcrypt.com + */ +#ifndef BN_H_ +#define BN_H_ + +#include <stdio.h> +#include <string.h> +#include <stdlib.h> +#include <ctype.h> +#include <limits.h> + +#include <tommath_class.h> + +#ifndef MIN + #define MIN(x,y) ((x)<(y)?(x):(y)) +#endif + +#ifndef MAX + #define MAX(x,y) ((x)>(y)?(x):(y)) +#endif + +#ifdef __cplusplus +extern "C" { + +/* C++ compilers don't like assigning void * to mp_digit * */ +#define OPT_CAST(x) (x *) + +#else + +/* C on the other hand doesn't care */ +#define OPT_CAST(x) + +#endif + + +/* detect 64-bit mode if possible */ +#if defined(__x86_64__) + #if !(defined(MP_64BIT) && defined(MP_16BIT) && defined(MP_8BIT)) + #define MP_64BIT + #endif +#endif + +/* some default configurations. + * + * A "mp_digit" must be able to hold DIGIT_BIT + 1 bits + * A "mp_word" must be able to hold 2*DIGIT_BIT + 1 bits + * + * At the very least a mp_digit must be able to hold 7 bits + * [any size beyond that is ok provided it doesn't overflow the data type] + */ +#ifdef MP_8BIT + typedef unsigned char mp_digit; + typedef unsigned short mp_word; +#elif defined(MP_16BIT) + typedef unsigned short mp_digit; + typedef unsigned long mp_word; +#elif defined(MP_64BIT) + /* for GCC only on supported platforms */ +#ifndef CRYPT + typedef unsigned long long ulong64; + typedef signed long long long64; +#endif + + typedef unsigned long mp_digit; + typedef unsigned long mp_word __attribute__ ((mode(TI))); + + #define DIGIT_BIT 60 +#else + /* this is the default case, 28-bit digits */ + + /* this is to make porting into LibTomCrypt easier :-) */ +#ifndef CRYPT + #if defined(_MSC_VER) || defined(__BORLANDC__) + typedef unsigned __int64 ulong64; + typedef signed __int64 long64; + #else + typedef unsigned long long ulong64; + typedef signed long long long64; + #endif +#endif + + typedef unsigned long mp_digit; + typedef ulong64 mp_word; + +#ifdef MP_31BIT + /* this is an extension that uses 31-bit digits */ + #define DIGIT_BIT 31 +#else + /* default case is 28-bit digits, defines MP_28BIT as a handy macro to test */ + #define DIGIT_BIT 28 + #define MP_28BIT +#endif +#endif + +/* define heap macros */ +#ifndef CRYPT + /* default to libc stuff */ + #ifndef XMALLOC + #define XMALLOC malloc + #define XFREE free + #define XREALLOC realloc + #define XCALLOC calloc + #else + /* prototypes for our heap functions */ + extern void *XMALLOC(size_t n); + extern void *XREALLOC(void *p, size_t n); + extern void *XCALLOC(size_t n, size_t s); + extern void XFREE(void *p); + #endif +#endif + + +/* otherwise the bits per digit is calculated automatically from the size of a mp_digit */ +#ifndef DIGIT_BIT + #define DIGIT_BIT ((int)((CHAR_BIT * sizeof(mp_digit) - 1))) /* bits per digit */ +#endif + +#define MP_DIGIT_BIT DIGIT_BIT +#define MP_MASK ((((mp_digit)1)<<((mp_digit)DIGIT_BIT))-((mp_digit)1)) +#define MP_DIGIT_MAX MP_MASK + +/* equalities */ +#define MP_LT -1 /* less than */ +#define MP_EQ 0 /* equal to */ +#define MP_GT 1 /* greater than */ + +#define MP_ZPOS 0 /* positive integer */ +#define MP_NEG 1 /* negative */ + +#define MP_OKAY 0 /* ok result */ +#define MP_MEM -2 /* out of mem */ +#define MP_VAL -3 /* invalid input */ +#define MP_RANGE MP_VAL + +#define MP_YES 1 /* yes response */ +#define MP_NO 0 /* no response */ + +/* Primality generation flags */ +#define LTM_PRIME_BBS 0x0001 /* BBS style prime */ +#define LTM_PRIME_SAFE 0x0002 /* Safe prime (p-1)/2 == prime */ +#define LTM_PRIME_2MSB_ON 0x0008 /* force 2nd MSB to 1 */ + +typedef int mp_err; + +/* you'll have to tune these... */ +extern int KARATSUBA_MUL_CUTOFF, + KARATSUBA_SQR_CUTOFF, + TOOM_MUL_CUTOFF, + TOOM_SQR_CUTOFF; + +/* define this to use lower memory usage routines (exptmods mostly) */ +/* #define MP_LOW_MEM */ + +/* default precision */ +#ifndef MP_PREC + #ifndef MP_LOW_MEM + #define MP_PREC 32 /* default digits of precision */ + #else + #define MP_PREC 8 /* default digits of precision */ + #endif +#endif + +/* size of comba arrays, should be at least 2 * 2**(BITS_PER_WORD - BITS_PER_DIGIT*2) */ +#define MP_WARRAY (1 << (sizeof(mp_word) * CHAR_BIT - 2 * DIGIT_BIT + 1)) + +/* the infamous mp_int structure */ +typedef struct { + int used, alloc, sign; + mp_digit *dp; +} mp_int; + +/* callback for mp_prime_random, should fill dst with random bytes and return how many read [upto len] */ +typedef int ltm_prime_callback(unsigned char *dst, int len, void *dat); + + +#define USED(m) ((m)->used) +#define DIGIT(m,k) ((m)->dp[(k)]) +#define SIGN(m) ((m)->sign) + +/* error code to char* string */ +char *mp_error_to_string(int code); + +/* ---> init and deinit bignum functions <--- */ +/* init a bignum */ +int mp_init(mp_int *a); + +/* free a bignum */ +void mp_clear(mp_int *a); + +/* init a null terminated series of arguments */ +int mp_init_multi(mp_int *mp, ...); + +/* clear a null terminated series of arguments */ +void mp_clear_multi(mp_int *mp, ...); + +/* exchange two ints */ +void mp_exch(mp_int *a, mp_int *b); + +/* shrink ram required for a bignum */ +int mp_shrink(mp_int *a); + +/* grow an int to a given size */ +int mp_grow(mp_int *a, int size); + +/* init to a given number of digits */ +int mp_init_size(mp_int *a, int size); + +/* ---> Basic Manipulations <--- */ +#define mp_iszero(a) (((a)->used == 0) ? MP_YES : MP_NO) +#define mp_iseven(a) (((a)->used > 0 && (((a)->dp[0] & 1) == 0)) ? MP_YES : MP_NO) +#define mp_isodd(a) (((a)->used > 0 && (((a)->dp[0] & 1) == 1)) ? MP_YES : MP_NO) +#define mp_isneg(a) (((a)->sign) ? MP_YES : MP_NO) + +/* set to zero */ +void mp_zero(mp_int *a); + +/* set to zero, multi */ +void mp_zero_multi(mp_int *a, ...); + +/* set to a digit */ +void mp_set(mp_int *a, mp_digit b); + +/* set a 32-bit const */ +int mp_set_int(mp_int *a, unsigned long b); + +/* get a 32-bit value */ +unsigned long mp_get_int(mp_int * a); + +/* initialize and set a digit */ +int mp_init_set (mp_int * a, mp_digit b); + +/* initialize and set 32-bit value */ +int mp_init_set_int (mp_int * a, unsigned long b); + +/* copy, b = a */ +int mp_copy(mp_int *a, mp_int *b); + +/* inits and copies, a = b */ +int mp_init_copy(mp_int *a, mp_int *b); + +/* trim unused digits */ +void mp_clamp(mp_int *a); + +/* ---> digit manipulation <--- */ + +/* right shift by "b" digits */ +void mp_rshd(mp_int *a, int b); + +/* left shift by "b" digits */ +int mp_lshd(mp_int *a, int b); + +/* c = a / 2**b */ +int mp_div_2d(mp_int *a, int b, mp_int *c, mp_int *d); + +/* b = a/2 */ +int mp_div_2(mp_int *a, mp_int *b); + +/* c = a * 2**b */ +int mp_mul_2d(mp_int *a, int b, mp_int *c); + +/* b = a*2 */ +int mp_mul_2(mp_int *a, mp_int *b); + +/* c = a mod 2**d */ +int mp_mod_2d(mp_int *a, int b, mp_int *c); + +/* computes a = 2**b */ +int mp_2expt(mp_int *a, int b); + +/* Counts the number of lsbs which are zero before the first zero bit */ +int mp_cnt_lsb(mp_int *a); + +/* I Love Earth! */ + +/* makes a pseudo-random int of a given size */ +int mp_rand(mp_int *a, int digits); + +/* ---> binary operations <--- */ +/* c = a XOR b */ +int mp_xor(mp_int *a, mp_int *b, mp_int *c); + +/* c = a OR b */ +int mp_or(mp_int *a, mp_int *b, mp_int *c); + +/* c = a AND b */ +int mp_and(mp_int *a, mp_int *b, mp_int *c); + +/* ---> Basic arithmetic <--- */ + +/* b = -a */ +int mp_neg(mp_int *a, mp_int *b); + +/* b = |a| */ +int mp_abs(mp_int *a, mp_int *b); + +/* compare a to b */ +int mp_cmp(mp_int *a, mp_int *b); + +/* compare |a| to |b| */ +int mp_cmp_mag(mp_int *a, mp_int *b); + +/* c = a + b */ +int mp_add(mp_int *a, mp_int *b, mp_int *c); + +/* c = a - b */ +int mp_sub(mp_int *a, mp_int *b, mp_int *c); + +/* c = a * b */ +int mp_mul(mp_int *a, mp_int *b, mp_int *c); + +/* b = a*a */ +int mp_sqr(mp_int *a, mp_int *b); + +/* a/b => cb + d == a */ +int mp_div(mp_int *a, mp_int *b, mp_int *c, mp_int *d); + +/* c = a mod b, 0 <= c < b */ +int mp_mod(mp_int *a, mp_int *b, mp_int *c); + +/* ---> single digit functions <--- */ + +/* compare against a single digit */ +int mp_cmp_d(mp_int *a, mp_digit b); + +/* c = a + b */ +int mp_add_d(mp_int *a, mp_digit b, mp_int *c); + +/* c = a - b */ +int mp_sub_d(mp_int *a, mp_digit b, mp_int *c); + +/* c = a * b */ +int mp_mul_d(mp_int *a, mp_digit b, mp_int *c); + +/* a/b => cb + d == a */ +int mp_div_d(mp_int *a, mp_digit b, mp_int *c, mp_digit *d); + +/* a/3 => 3c + d == a */ +int mp_div_3(mp_int *a, mp_int *c, mp_digit *d); + +/* c = a**b */ +int mp_expt_d(mp_int *a, mp_digit b, mp_int *c); + +/* c = a mod b, 0 <= c < b */ +int mp_mod_d(mp_int *a, mp_digit b, mp_digit *c); + +/* ---> number theory <--- */ + +/* d = a + b (mod c) */ +int mp_addmod(mp_int *a, mp_int *b, mp_int *c, mp_int *d); + +/* d = a - b (mod c) */ +int mp_submod(mp_int *a, mp_int *b, mp_int *c, mp_int *d); + +/* d = a * b (mod c) */ +int mp_mulmod(mp_int *a, mp_int *b, mp_int *c, mp_int *d); + +/* c = a * a (mod b) */ +int mp_sqrmod(mp_int *a, mp_int *b, mp_int *c); + +/* c = 1/a (mod b) */ +int mp_invmod(mp_int *a, mp_int *b, mp_int *c); + +/* c = (a, b) */ +int mp_gcd(mp_int *a, mp_int *b, mp_int *c); + +/* produces value such that U1*a + U2*b = U3 */ +int mp_exteuclid(mp_int *a, mp_int *b, mp_int *U1, mp_int *U2, mp_int *U3); + +/* c = [a, b] or (a*b)/(a, b) */ +int mp_lcm(mp_int *a, mp_int *b, mp_int *c); + +/* finds one of the b'th root of a, such that |c|**b <= |a| + * + * returns error if a < 0 and b is even + */ +int mp_n_root(mp_int *a, mp_digit b, mp_int *c); + +/* special sqrt algo */ +int mp_sqrt(mp_int *arg, mp_int *ret); + +/* is number a square? */ +int mp_is_square(mp_int *arg, int *ret); + +/* computes the jacobi c = (a | n) (or Legendre if b is prime) */ +int mp_jacobi(mp_int *a, mp_int *n, int *c); + +/* used to setup the Barrett reduction for a given modulus b */ +int mp_reduce_setup(mp_int *a, mp_int *b); + +/* Barrett Reduction, computes a (mod b) with a precomputed value c + * + * Assumes that 0 < a <= b*b, note if 0 > a > -(b*b) then you can merely + * compute the reduction as -1 * mp_reduce(mp_abs(a)) [pseudo code]. + */ +int mp_reduce(mp_int *a, mp_int *b, mp_int *c); + +/* setups the montgomery reduction */ +int mp_montgomery_setup(mp_int *a, mp_digit *mp); + +/* computes a = B**n mod b without division or multiplication useful for + * normalizing numbers in a Montgomery system. + */ +int mp_montgomery_calc_normalization(mp_int *a, mp_int *b); + +/* computes x/R == x (mod N) via Montgomery Reduction */ +int mp_montgomery_reduce(mp_int *a, mp_int *m, mp_digit mp); + +/* returns 1 if a is a valid DR modulus */ +int mp_dr_is_modulus(mp_int *a); + +/* sets the value of "d" required for mp_dr_reduce */ +void mp_dr_setup(mp_int *a, mp_digit *d); + +/* reduces a modulo b using the Diminished Radix method */ +int mp_dr_reduce(mp_int *a, mp_int *b, mp_digit mp); + +/* returns true if a can be reduced with mp_reduce_2k */ +int mp_reduce_is_2k(mp_int *a); + +/* determines k value for 2k reduction */ +int mp_reduce_2k_setup(mp_int *a, mp_digit *d); + +/* reduces a modulo b where b is of the form 2**p - k [0 <= a] */ +int mp_reduce_2k(mp_int *a, mp_int *n, mp_digit d); + +/* returns true if a can be reduced with mp_reduce_2k_l */ +int mp_reduce_is_2k_l(mp_int *a); + +/* determines k value for 2k reduction */ +int mp_reduce_2k_setup_l(mp_int *a, mp_int *d); + +/* reduces a modulo b where b is of the form 2**p - k [0 <= a] */ +int mp_reduce_2k_l(mp_int *a, mp_int *n, mp_int *d); + +/* d = a**b (mod c) */ +int mp_exptmod(mp_int *a, mp_int *b, mp_int *c, mp_int *d); + +/* ---> Primes <--- */ + +/* number of primes */ +#ifdef MP_8BIT + #define PRIME_SIZE 31 +#else + #define PRIME_SIZE 256 +#endif + +/* table of first PRIME_SIZE primes */ +extern const mp_digit ltm_prime_tab[]; + +/* result=1 if a is divisible by one of the first PRIME_SIZE primes */ +int mp_prime_is_divisible(mp_int *a, int *result); + +/* performs one Fermat test of "a" using base "b". + * Sets result to 0 if composite or 1 if probable prime + */ +int mp_prime_fermat(mp_int *a, mp_int *b, int *result); + +/* performs one Miller-Rabin test of "a" using base "b". + * Sets result to 0 if composite or 1 if probable prime + */ +int mp_prime_miller_rabin(mp_int *a, mp_int *b, int *result); + +/* This gives [for a given bit size] the number of trials required + * such that Miller-Rabin gives a prob of failure lower than 2^-96 + */ +int mp_prime_rabin_miller_trials(int size); + +/* performs t rounds of Miller-Rabin on "a" using the first + * t prime bases. Also performs an initial sieve of trial + * division. Determines if "a" is prime with probability + * of error no more than (1/4)**t. + * + * Sets result to 1 if probably prime, 0 otherwise + */ +int mp_prime_is_prime(mp_int *a, int t, int *result); + +/* finds the next prime after the number "a" using "t" trials + * of Miller-Rabin. + * + * bbs_style = 1 means the prime must be congruent to 3 mod 4 + */ +int mp_prime_next_prime(mp_int *a, int t, int bbs_style); + +/* makes a truly random prime of a given size (bytes), + * call with bbs = 1 if you want it to be congruent to 3 mod 4 + * + * You have to supply a callback which fills in a buffer with random bytes. "dat" is a parameter you can + * have passed to the callback (e.g. a state or something). This function doesn't use "dat" itself + * so it can be NULL + * + * The prime generated will be larger than 2^(8*size). + */ +#define mp_prime_random(a, t, size, bbs, cb, dat) mp_prime_random_ex(a, t, ((size) * 8) + 1, (bbs==1)?LTM_PRIME_BBS:0, cb, dat) + +/* makes a truly random prime of a given size (bits), + * + * Flags are as follows: + * + * LTM_PRIME_BBS - make prime congruent to 3 mod 4 + * LTM_PRIME_SAFE - make sure (p-1)/2 is prime as well (implies LTM_PRIME_BBS) + * LTM_PRIME_2MSB_OFF - make the 2nd highest bit zero + * LTM_PRIME_2MSB_ON - make the 2nd highest bit one + * + * You have to supply a callback which fills in a buffer with random bytes. "dat" is a parameter you can + * have passed to the callback (e.g. a state or something). This function doesn't use "dat" itself + * so it can be NULL + * + */ +int mp_prime_random_ex(mp_int *a, int t, int size, int flags, ltm_prime_callback cb, void *dat); + +int mp_find_prime(mp_int *a); + +int mp_isprime(mp_int *a); + +/* ---> radix conversion <--- */ +int mp_count_bits(mp_int *a); + +int mp_unsigned_bin_size(mp_int *a); +int mp_read_unsigned_bin(mp_int *a, const unsigned char *b, int c); +int mp_to_unsigned_bin(mp_int *a, unsigned char *b); +int mp_to_unsigned_bin_n (mp_int * a, unsigned char *b, unsigned long *outlen); + +int mp_signed_bin_size(mp_int *a); +int mp_read_signed_bin(mp_int *a, const unsigned char *b, int c); +int mp_to_signed_bin(mp_int *a, unsigned char *b); +int mp_to_signed_bin_n (mp_int * a, unsigned char *b, unsigned long *outlen); + +int mp_read_radix(mp_int *a, const char *str, int radix); +int mp_toradix(mp_int *a, char *str, int radix); +int mp_toradix_n(mp_int * a, char *str, int radix, int maxlen); +int mp_radix_size(mp_int *a, int radix, int *size); + +int mp_fread(mp_int *a, int radix, FILE *stream); +int mp_fwrite(mp_int *a, int radix, FILE *stream); + +#define mp_read_raw(mp, str, len) mp_read_signed_bin((mp), (str), (len)) +#define mp_raw_size(mp) mp_signed_bin_size(mp) +#define mp_toraw(mp, str) mp_to_signed_bin((mp), (str)) +#define mp_read_mag(mp, str, len) mp_read_unsigned_bin((mp), (str), (len)) +#define mp_mag_size(mp) mp_unsigned_bin_size(mp) +#define mp_tomag(mp, str) mp_to_unsigned_bin((mp), (str)) + +#define mp_tobinary(M, S) mp_toradix((M), (S), 2) +#define mp_tooctal(M, S) mp_toradix((M), (S), 8) +#define mp_todecimal(M, S) mp_toradix((M), (S), 10) +#define mp_tohex(M, S) mp_toradix((M), (S), 16) + +/* lowlevel functions, do not call! */ +int s_mp_add(mp_int *a, mp_int *b, mp_int *c); +int s_mp_sub(mp_int *a, mp_int *b, mp_int *c); +#define s_mp_mul(a, b, c) s_mp_mul_digs(a, b, c, (a)->used + (b)->used + 1) +int fast_s_mp_mul_digs(mp_int *a, mp_int *b, mp_int *c, int digs); +int s_mp_mul_digs(mp_int *a, mp_int *b, mp_int *c, int digs); +int fast_s_mp_mul_high_digs(mp_int *a, mp_int *b, mp_int *c, int digs); +int s_mp_mul_high_digs(mp_int *a, mp_int *b, mp_int *c, int digs); +int fast_s_mp_sqr(mp_int *a, mp_int *b); +int s_mp_sqr(mp_int *a, mp_int *b); +int mp_karatsuba_mul(mp_int *a, mp_int *b, mp_int *c); +int mp_toom_mul(mp_int *a, mp_int *b, mp_int *c); +int mp_karatsuba_sqr(mp_int *a, mp_int *b); +int mp_toom_sqr(mp_int *a, mp_int *b); +int fast_mp_invmod(mp_int *a, mp_int *b, mp_int *c); +int mp_invmod_slow (mp_int * a, mp_int * b, mp_int * c); +int fast_mp_montgomery_reduce(mp_int *a, mp_int *m, mp_digit mp); +int mp_exptmod_fast(mp_int *G, mp_int *X, mp_int *P, mp_int *Y, int mode); +int s_mp_exptmod (mp_int * G, mp_int * X, mp_int * P, mp_int * Y, int mode); +void bn_reverse(unsigned char *s, int len); + +extern const char *mp_s_rmap; + +#ifdef __cplusplus + } +#endif + +#endif + + +/* $Source: /cvs/libtom/libtommath/tommath.h,v $ */ +/* $Revision: 1.8 $ */ +/* $Date: 2006/03/31 14:18:44 $ */ diff --git a/package/heimdal/src/lib/hcrypto/libtommath/tommath_class.h b/package/heimdal/src/lib/hcrypto/libtommath/tommath_class.h new file mode 100644 index 000000000..fa95a0277 --- /dev/null +++ b/package/heimdal/src/lib/hcrypto/libtommath/tommath_class.h @@ -0,0 +1,1000 @@ +#if !(defined(LTM1) && defined(LTM2) && defined(LTM3)) +#if defined(LTM2) +#define LTM3 +#endif +#if defined(LTM1) +#define LTM2 +#endif +#define LTM1 + +#if defined(LTM_ALL) +#define BN_ERROR_C +#define BN_FAST_MP_INVMOD_C +#define BN_FAST_MP_MONTGOMERY_REDUCE_C +#define BN_FAST_S_MP_MUL_DIGS_C +#define BN_FAST_S_MP_MUL_HIGH_DIGS_C +#define BN_FAST_S_MP_SQR_C +#define BN_MP_2EXPT_C +#define BN_MP_ABS_C +#define BN_MP_ADD_C +#define BN_MP_ADD_D_C +#define BN_MP_ADDMOD_C +#define BN_MP_AND_C +#define BN_MP_CLAMP_C +#define BN_MP_CLEAR_C +#define BN_MP_CLEAR_MULTI_C +#define BN_MP_CMP_C +#define BN_MP_CMP_D_C +#define BN_MP_CMP_MAG_C +#define BN_MP_CNT_LSB_C +#define BN_MP_COPY_C +#define BN_MP_COUNT_BITS_C +#define BN_MP_DIV_C +#define BN_MP_DIV_2_C +#define BN_MP_DIV_2D_C +#define BN_MP_DIV_3_C +#define BN_MP_DIV_D_C +#define BN_MP_DR_IS_MODULUS_C +#define BN_MP_DR_REDUCE_C +#define BN_MP_DR_SETUP_C +#define BN_MP_EXCH_C +#define BN_MP_EXPT_D_C +#define BN_MP_EXPTMOD_C +#define BN_MP_EXPTMOD_FAST_C +#define BN_MP_EXTEUCLID_C +#define BN_MP_FREAD_C +#define BN_MP_FWRITE_C +#define BN_MP_GCD_C +#define BN_MP_GET_INT_C +#define BN_MP_GROW_C +#define BN_MP_INIT_C +#define BN_MP_INIT_COPY_C +#define BN_MP_INIT_MULTI_C +#define BN_MP_INIT_SET_C +#define BN_MP_INIT_SET_INT_C +#define BN_MP_INIT_SIZE_C +#define BN_MP_INVMOD_C +#define BN_MP_INVMOD_SLOW_C +#define BN_MP_IS_SQUARE_C +#define BN_MP_JACOBI_C +#define BN_MP_KARATSUBA_MUL_C +#define BN_MP_KARATSUBA_SQR_C +#define BN_MP_LCM_C +#define BN_MP_LSHD_C +#define BN_MP_MOD_C +#define BN_MP_MOD_2D_C +#define BN_MP_MOD_D_C +#define BN_MP_MONTGOMERY_CALC_NORMALIZATION_C +#define BN_MP_MONTGOMERY_REDUCE_C +#define BN_MP_MONTGOMERY_SETUP_C +#define BN_MP_MUL_C +#define BN_MP_MUL_2_C +#define BN_MP_MUL_2D_C +#define BN_MP_MUL_D_C +#define BN_MP_MULMOD_C +#define BN_MP_N_ROOT_C +#define BN_MP_NEG_C +#define BN_MP_OR_C +#define BN_MP_PRIME_FERMAT_C +#define BN_MP_PRIME_IS_DIVISIBLE_C +#define BN_MP_PRIME_IS_PRIME_C +#define BN_MP_PRIME_MILLER_RABIN_C +#define BN_MP_PRIME_NEXT_PRIME_C +#define BN_MP_PRIME_RABIN_MILLER_TRIALS_C +#define BN_MP_PRIME_RANDOM_EX_C +#define BN_MP_RADIX_SIZE_C +#define BN_MP_RADIX_SMAP_C +#define BN_MP_RAND_C +#define BN_MP_READ_RADIX_C +#define BN_MP_READ_SIGNED_BIN_C +#define BN_MP_READ_UNSIGNED_BIN_C +#define BN_MP_REDUCE_C +#define BN_MP_REDUCE_2K_C +#define BN_MP_REDUCE_2K_L_C +#define BN_MP_REDUCE_2K_SETUP_C +#define BN_MP_REDUCE_2K_SETUP_L_C +#define BN_MP_REDUCE_IS_2K_C +#define BN_MP_REDUCE_IS_2K_L_C +#define BN_MP_REDUCE_SETUP_C +#define BN_MP_RSHD_C +#define BN_MP_SET_C +#define BN_MP_SET_INT_C +#define BN_MP_SHRINK_C +#define BN_MP_SIGNED_BIN_SIZE_C +#define BN_MP_SQR_C +#define BN_MP_SQRMOD_C +#define BN_MP_SQRT_C +#define BN_MP_SUB_C +#define BN_MP_SUB_D_C +#define BN_MP_SUBMOD_C +#define BN_MP_TO_SIGNED_BIN_C +#define BN_MP_TO_SIGNED_BIN_N_C +#define BN_MP_TO_UNSIGNED_BIN_C +#define BN_MP_TO_UNSIGNED_BIN_N_C +#define BN_MP_TOOM_MUL_C +#define BN_MP_TOOM_SQR_C +#define BN_MP_TORADIX_C +#define BN_MP_TORADIX_N_C +#define BN_MP_UNSIGNED_BIN_SIZE_C +#define BN_MP_XOR_C +#define BN_MP_ZERO_C +#define BN_MP_ZERO_MULTI_C +#define BN_PRIME_TAB_C +#define BN_REVERSE_C +#define BN_S_MP_ADD_C +#define BN_S_MP_EXPTMOD_C +#define BN_S_MP_MUL_DIGS_C +#define BN_S_MP_MUL_HIGH_DIGS_C +#define BN_S_MP_SQR_C +#define BN_S_MP_SUB_C +#define BNCORE_C +#endif + +#if defined(BN_ERROR_C) + #define BN_MP_ERROR_TO_STRING_C +#endif + +#if defined(BN_FAST_MP_INVMOD_C) + #define BN_MP_ISEVEN_C + #define BN_MP_INIT_MULTI_C + #define BN_MP_COPY_C + #define BN_MP_MOD_C + #define BN_MP_SET_C + #define BN_MP_DIV_2_C + #define BN_MP_ISODD_C + #define BN_MP_SUB_C + #define BN_MP_CMP_C + #define BN_MP_ISZERO_C + #define BN_MP_CMP_D_C + #define BN_MP_ADD_C + #define BN_MP_EXCH_C + #define BN_MP_CLEAR_MULTI_C +#endif + +#if defined(BN_FAST_MP_MONTGOMERY_REDUCE_C) + #define BN_MP_GROW_C + #define BN_MP_RSHD_C + #define BN_MP_CLAMP_C + #define BN_MP_CMP_MAG_C + #define BN_S_MP_SUB_C +#endif + +#if defined(BN_FAST_S_MP_MUL_DIGS_C) + #define BN_MP_GROW_C + #define BN_MP_CLAMP_C +#endif + +#if defined(BN_FAST_S_MP_MUL_HIGH_DIGS_C) + #define BN_MP_GROW_C + #define BN_MP_CLAMP_C +#endif + +#if defined(BN_FAST_S_MP_SQR_C) + #define BN_MP_GROW_C + #define BN_MP_CLAMP_C +#endif + +#if defined(BN_MP_2EXPT_C) + #define BN_MP_ZERO_C + #define BN_MP_GROW_C +#endif + +#if defined(BN_MP_ABS_C) + #define BN_MP_COPY_C +#endif + +#if defined(BN_MP_ADD_C) + #define BN_S_MP_ADD_C + #define BN_MP_CMP_MAG_C + #define BN_S_MP_SUB_C +#endif + +#if defined(BN_MP_ADD_D_C) + #define BN_MP_GROW_C + #define BN_MP_SUB_D_C + #define BN_MP_CLAMP_C +#endif + +#if defined(BN_MP_ADDMOD_C) + #define BN_MP_INIT_C + #define BN_MP_ADD_C + #define BN_MP_CLEAR_C + #define BN_MP_MOD_C +#endif + +#if defined(BN_MP_AND_C) + #define BN_MP_INIT_COPY_C + #define BN_MP_CLAMP_C + #define BN_MP_EXCH_C + #define BN_MP_CLEAR_C +#endif + +#if defined(BN_MP_CLAMP_C) +#endif + +#if defined(BN_MP_CLEAR_C) +#endif + +#if defined(BN_MP_CLEAR_MULTI_C) + #define BN_MP_CLEAR_C +#endif + +#if defined(BN_MP_CMP_C) + #define BN_MP_CMP_MAG_C +#endif + +#if defined(BN_MP_CMP_D_C) +#endif + +#if defined(BN_MP_CMP_MAG_C) +#endif + +#if defined(BN_MP_CNT_LSB_C) + #define BN_MP_ISZERO_C +#endif + +#if defined(BN_MP_COPY_C) + #define BN_MP_GROW_C +#endif + +#if defined(BN_MP_COUNT_BITS_C) +#endif + +#if defined(BN_MP_DIV_C) + #define BN_MP_ISZERO_C + #define BN_MP_CMP_MAG_C + #define BN_MP_COPY_C + #define BN_MP_ZERO_C + #define BN_MP_INIT_MULTI_C + #define BN_MP_SET_C + #define BN_MP_COUNT_BITS_C + #define BN_MP_ABS_C + #define BN_MP_MUL_2D_C + #define BN_MP_CMP_C + #define BN_MP_SUB_C + #define BN_MP_ADD_C + #define BN_MP_DIV_2D_C + #define BN_MP_EXCH_C + #define BN_MP_CLEAR_MULTI_C + #define BN_MP_INIT_SIZE_C + #define BN_MP_INIT_C + #define BN_MP_INIT_COPY_C + #define BN_MP_LSHD_C + #define BN_MP_RSHD_C + #define BN_MP_MUL_D_C + #define BN_MP_CLAMP_C + #define BN_MP_CLEAR_C +#endif + +#if defined(BN_MP_DIV_2_C) + #define BN_MP_GROW_C + #define BN_MP_CLAMP_C +#endif + +#if defined(BN_MP_DIV_2D_C) + #define BN_MP_COPY_C + #define BN_MP_ZERO_C + #define BN_MP_INIT_C + #define BN_MP_MOD_2D_C + #define BN_MP_CLEAR_C + #define BN_MP_RSHD_C + #define BN_MP_CLAMP_C + #define BN_MP_EXCH_C +#endif + +#if defined(BN_MP_DIV_3_C) + #define BN_MP_INIT_SIZE_C + #define BN_MP_CLAMP_C + #define BN_MP_EXCH_C + #define BN_MP_CLEAR_C +#endif + +#if defined(BN_MP_DIV_D_C) + #define BN_MP_ISZERO_C + #define BN_MP_COPY_C + #define BN_MP_DIV_2D_C + #define BN_MP_DIV_3_C + #define BN_MP_INIT_SIZE_C + #define BN_MP_CLAMP_C + #define BN_MP_EXCH_C + #define BN_MP_CLEAR_C +#endif + +#if defined(BN_MP_DR_IS_MODULUS_C) +#endif + +#if defined(BN_MP_DR_REDUCE_C) + #define BN_MP_GROW_C + #define BN_MP_CLAMP_C + #define BN_MP_CMP_MAG_C + #define BN_S_MP_SUB_C +#endif + +#if defined(BN_MP_DR_SETUP_C) +#endif + +#if defined(BN_MP_EXCH_C) +#endif + +#if defined(BN_MP_EXPT_D_C) + #define BN_MP_INIT_COPY_C + #define BN_MP_SET_C + #define BN_MP_SQR_C + #define BN_MP_CLEAR_C + #define BN_MP_MUL_C +#endif + +#if defined(BN_MP_EXPTMOD_C) + #define BN_MP_INIT_C + #define BN_MP_INVMOD_C + #define BN_MP_CLEAR_C + #define BN_MP_ABS_C + #define BN_MP_CLEAR_MULTI_C + #define BN_MP_REDUCE_IS_2K_L_C + #define BN_S_MP_EXPTMOD_C + #define BN_MP_DR_IS_MODULUS_C + #define BN_MP_REDUCE_IS_2K_C + #define BN_MP_ISODD_C + #define BN_MP_EXPTMOD_FAST_C +#endif + +#if defined(BN_MP_EXPTMOD_FAST_C) + #define BN_MP_COUNT_BITS_C + #define BN_MP_INIT_C + #define BN_MP_CLEAR_C + #define BN_MP_MONTGOMERY_SETUP_C + #define BN_FAST_MP_MONTGOMERY_REDUCE_C + #define BN_MP_MONTGOMERY_REDUCE_C + #define BN_MP_DR_SETUP_C + #define BN_MP_DR_REDUCE_C + #define BN_MP_REDUCE_2K_SETUP_C + #define BN_MP_REDUCE_2K_C + #define BN_MP_MONTGOMERY_CALC_NORMALIZATION_C + #define BN_MP_MULMOD_C + #define BN_MP_SET_C + #define BN_MP_MOD_C + #define BN_MP_COPY_C + #define BN_MP_SQR_C + #define BN_MP_MUL_C + #define BN_MP_EXCH_C +#endif + +#if defined(BN_MP_EXTEUCLID_C) + #define BN_MP_INIT_MULTI_C + #define BN_MP_SET_C + #define BN_MP_COPY_C + #define BN_MP_ISZERO_C + #define BN_MP_DIV_C + #define BN_MP_MUL_C + #define BN_MP_SUB_C + #define BN_MP_NEG_C + #define BN_MP_EXCH_C + #define BN_MP_CLEAR_MULTI_C +#endif + +#if defined(BN_MP_FREAD_C) + #define BN_MP_ZERO_C + #define BN_MP_S_RMAP_C + #define BN_MP_MUL_D_C + #define BN_MP_ADD_D_C + #define BN_MP_CMP_D_C +#endif + +#if defined(BN_MP_FWRITE_C) + #define BN_MP_RADIX_SIZE_C + #define BN_MP_TORADIX_C +#endif + +#if defined(BN_MP_GCD_C) + #define BN_MP_ISZERO_C + #define BN_MP_ABS_C + #define BN_MP_ZERO_C + #define BN_MP_INIT_COPY_C + #define BN_MP_CNT_LSB_C + #define BN_MP_DIV_2D_C + #define BN_MP_CMP_MAG_C + #define BN_MP_EXCH_C + #define BN_S_MP_SUB_C + #define BN_MP_MUL_2D_C + #define BN_MP_CLEAR_C +#endif + +#if defined(BN_MP_GET_INT_C) +#endif + +#if defined(BN_MP_GROW_C) +#endif + +#if defined(BN_MP_INIT_C) +#endif + +#if defined(BN_MP_INIT_COPY_C) + #define BN_MP_COPY_C +#endif + +#if defined(BN_MP_INIT_MULTI_C) + #define BN_MP_ERR_C + #define BN_MP_INIT_C + #define BN_MP_CLEAR_C +#endif + +#if defined(BN_MP_INIT_SET_C) + #define BN_MP_INIT_C + #define BN_MP_SET_C +#endif + +#if defined(BN_MP_INIT_SET_INT_C) + #define BN_MP_INIT_C + #define BN_MP_SET_INT_C +#endif + +#if defined(BN_MP_INIT_SIZE_C) + #define BN_MP_INIT_C +#endif + +#if defined(BN_MP_INVMOD_C) + #define BN_MP_ISZERO_C + #define BN_MP_ISODD_C + #define BN_FAST_MP_INVMOD_C + #define BN_MP_INVMOD_SLOW_C +#endif + +#if defined(BN_MP_INVMOD_SLOW_C) + #define BN_MP_ISZERO_C + #define BN_MP_INIT_MULTI_C + #define BN_MP_MOD_C + #define BN_MP_COPY_C + #define BN_MP_ISEVEN_C + #define BN_MP_SET_C + #define BN_MP_DIV_2_C + #define BN_MP_ISODD_C + #define BN_MP_ADD_C + #define BN_MP_SUB_C + #define BN_MP_CMP_C + #define BN_MP_CMP_D_C + #define BN_MP_CMP_MAG_C + #define BN_MP_EXCH_C + #define BN_MP_CLEAR_MULTI_C +#endif + +#if defined(BN_MP_IS_SQUARE_C) + #define BN_MP_MOD_D_C + #define BN_MP_INIT_SET_INT_C + #define BN_MP_MOD_C + #define BN_MP_GET_INT_C + #define BN_MP_SQRT_C + #define BN_MP_SQR_C + #define BN_MP_CMP_MAG_C + #define BN_MP_CLEAR_C +#endif + +#if defined(BN_MP_JACOBI_C) + #define BN_MP_CMP_D_C + #define BN_MP_ISZERO_C + #define BN_MP_INIT_COPY_C + #define BN_MP_CNT_LSB_C + #define BN_MP_DIV_2D_C + #define BN_MP_MOD_C + #define BN_MP_CLEAR_C +#endif + +#if defined(BN_MP_KARATSUBA_MUL_C) + #define BN_MP_MUL_C + #define BN_MP_INIT_SIZE_C + #define BN_MP_CLAMP_C + #define BN_MP_SUB_C + #define BN_MP_ADD_C + #define BN_MP_LSHD_C + #define BN_MP_CLEAR_C +#endif + +#if defined(BN_MP_KARATSUBA_SQR_C) + #define BN_MP_INIT_SIZE_C + #define BN_MP_CLAMP_C + #define BN_MP_SQR_C + #define BN_MP_SUB_C + #define BN_S_MP_ADD_C + #define BN_MP_LSHD_C + #define BN_MP_ADD_C + #define BN_MP_CLEAR_C +#endif + +#if defined(BN_MP_LCM_C) + #define BN_MP_INIT_MULTI_C + #define BN_MP_GCD_C + #define BN_MP_CMP_MAG_C + #define BN_MP_DIV_C + #define BN_MP_MUL_C + #define BN_MP_CLEAR_MULTI_C +#endif + +#if defined(BN_MP_LSHD_C) + #define BN_MP_GROW_C + #define BN_MP_RSHD_C +#endif + +#if defined(BN_MP_MOD_C) + #define BN_MP_INIT_C + #define BN_MP_DIV_C + #define BN_MP_CLEAR_C + #define BN_MP_ADD_C + #define BN_MP_EXCH_C +#endif + +#if defined(BN_MP_MOD_2D_C) + #define BN_MP_ZERO_C + #define BN_MP_COPY_C + #define BN_MP_CLAMP_C +#endif + +#if defined(BN_MP_MOD_D_C) + #define BN_MP_DIV_D_C +#endif + +#if defined(BN_MP_MONTGOMERY_CALC_NORMALIZATION_C) + #define BN_MP_COUNT_BITS_C + #define BN_MP_2EXPT_C + #define BN_MP_SET_C + #define BN_MP_MUL_2_C + #define BN_MP_CMP_MAG_C + #define BN_S_MP_SUB_C +#endif + +#if defined(BN_MP_MONTGOMERY_REDUCE_C) + #define BN_FAST_MP_MONTGOMERY_REDUCE_C + #define BN_MP_GROW_C + #define BN_MP_CLAMP_C + #define BN_MP_RSHD_C + #define BN_MP_CMP_MAG_C + #define BN_S_MP_SUB_C +#endif + +#if defined(BN_MP_MONTGOMERY_SETUP_C) +#endif + +#if defined(BN_MP_MUL_C) + #define BN_MP_TOOM_MUL_C + #define BN_MP_KARATSUBA_MUL_C + #define BN_FAST_S_MP_MUL_DIGS_C + #define BN_S_MP_MUL_C + #define BN_S_MP_MUL_DIGS_C +#endif + +#if defined(BN_MP_MUL_2_C) + #define BN_MP_GROW_C +#endif + +#if defined(BN_MP_MUL_2D_C) + #define BN_MP_COPY_C + #define BN_MP_GROW_C + #define BN_MP_LSHD_C + #define BN_MP_CLAMP_C +#endif + +#if defined(BN_MP_MUL_D_C) + #define BN_MP_GROW_C + #define BN_MP_CLAMP_C +#endif + +#if defined(BN_MP_MULMOD_C) + #define BN_MP_INIT_C + #define BN_MP_MUL_C + #define BN_MP_CLEAR_C + #define BN_MP_MOD_C +#endif + +#if defined(BN_MP_N_ROOT_C) + #define BN_MP_INIT_C + #define BN_MP_SET_C + #define BN_MP_COPY_C + #define BN_MP_EXPT_D_C + #define BN_MP_MUL_C + #define BN_MP_SUB_C + #define BN_MP_MUL_D_C + #define BN_MP_DIV_C + #define BN_MP_CMP_C + #define BN_MP_SUB_D_C + #define BN_MP_EXCH_C + #define BN_MP_CLEAR_C +#endif + +#if defined(BN_MP_NEG_C) + #define BN_MP_COPY_C + #define BN_MP_ISZERO_C +#endif + +#if defined(BN_MP_OR_C) + #define BN_MP_INIT_COPY_C + #define BN_MP_CLAMP_C + #define BN_MP_EXCH_C + #define BN_MP_CLEAR_C +#endif + +#if defined(BN_MP_PRIME_FERMAT_C) + #define BN_MP_CMP_D_C + #define BN_MP_INIT_C + #define BN_MP_EXPTMOD_C + #define BN_MP_CMP_C + #define BN_MP_CLEAR_C +#endif + +#if defined(BN_MP_PRIME_IS_DIVISIBLE_C) + #define BN_MP_MOD_D_C +#endif + +#if defined(BN_MP_PRIME_IS_PRIME_C) + #define BN_MP_CMP_D_C + #define BN_MP_PRIME_IS_DIVISIBLE_C + #define BN_MP_INIT_C + #define BN_MP_SET_C + #define BN_MP_PRIME_MILLER_RABIN_C + #define BN_MP_CLEAR_C +#endif + +#if defined(BN_MP_PRIME_MILLER_RABIN_C) + #define BN_MP_CMP_D_C + #define BN_MP_INIT_COPY_C + #define BN_MP_SUB_D_C + #define BN_MP_CNT_LSB_C + #define BN_MP_DIV_2D_C + #define BN_MP_EXPTMOD_C + #define BN_MP_CMP_C + #define BN_MP_SQRMOD_C + #define BN_MP_CLEAR_C +#endif + +#if defined(BN_MP_PRIME_NEXT_PRIME_C) + #define BN_MP_CMP_D_C + #define BN_MP_SET_C + #define BN_MP_SUB_D_C + #define BN_MP_ISEVEN_C + #define BN_MP_MOD_D_C + #define BN_MP_INIT_C + #define BN_MP_ADD_D_C + #define BN_MP_PRIME_MILLER_RABIN_C + #define BN_MP_CLEAR_C +#endif + +#if defined(BN_MP_PRIME_RABIN_MILLER_TRIALS_C) +#endif + +#if defined(BN_MP_PRIME_RANDOM_EX_C) + #define BN_MP_READ_UNSIGNED_BIN_C + #define BN_MP_PRIME_IS_PRIME_C + #define BN_MP_SUB_D_C + #define BN_MP_DIV_2_C + #define BN_MP_MUL_2_C + #define BN_MP_ADD_D_C +#endif + +#if defined(BN_MP_RADIX_SIZE_C) + #define BN_MP_COUNT_BITS_C + #define BN_MP_INIT_COPY_C + #define BN_MP_ISZERO_C + #define BN_MP_DIV_D_C + #define BN_MP_CLEAR_C +#endif + +#if defined(BN_MP_RADIX_SMAP_C) + #define BN_MP_S_RMAP_C +#endif + +#if defined(BN_MP_RAND_C) + #define BN_MP_ZERO_C + #define BN_MP_ADD_D_C + #define BN_MP_LSHD_C +#endif + +#if defined(BN_MP_READ_RADIX_C) + #define BN_MP_ZERO_C + #define BN_MP_S_RMAP_C + #define BN_MP_RADIX_SMAP_C + #define BN_MP_MUL_D_C + #define BN_MP_ADD_D_C + #define BN_MP_ISZERO_C +#endif + +#if defined(BN_MP_READ_SIGNED_BIN_C) + #define BN_MP_READ_UNSIGNED_BIN_C +#endif + +#if defined(BN_MP_READ_UNSIGNED_BIN_C) + #define BN_MP_GROW_C + #define BN_MP_ZERO_C + #define BN_MP_MUL_2D_C + #define BN_MP_CLAMP_C +#endif + +#if defined(BN_MP_REDUCE_C) + #define BN_MP_REDUCE_SETUP_C + #define BN_MP_INIT_COPY_C + #define BN_MP_RSHD_C + #define BN_MP_MUL_C + #define BN_S_MP_MUL_HIGH_DIGS_C + #define BN_FAST_S_MP_MUL_HIGH_DIGS_C + #define BN_MP_MOD_2D_C + #define BN_S_MP_MUL_DIGS_C + #define BN_MP_SUB_C + #define BN_MP_CMP_D_C + #define BN_MP_SET_C + #define BN_MP_LSHD_C + #define BN_MP_ADD_C + #define BN_MP_CMP_C + #define BN_S_MP_SUB_C + #define BN_MP_CLEAR_C +#endif + +#if defined(BN_MP_REDUCE_2K_C) + #define BN_MP_INIT_C + #define BN_MP_COUNT_BITS_C + #define BN_MP_DIV_2D_C + #define BN_MP_MUL_D_C + #define BN_S_MP_ADD_C + #define BN_MP_CMP_MAG_C + #define BN_S_MP_SUB_C + #define BN_MP_CLEAR_C +#endif + +#if defined(BN_MP_REDUCE_2K_L_C) + #define BN_MP_INIT_C + #define BN_MP_COUNT_BITS_C + #define BN_MP_DIV_2D_C + #define BN_MP_MUL_C + #define BN_S_MP_ADD_C + #define BN_MP_CMP_MAG_C + #define BN_S_MP_SUB_C + #define BN_MP_CLEAR_C +#endif + +#if defined(BN_MP_REDUCE_2K_SETUP_C) + #define BN_MP_INIT_C + #define BN_MP_COUNT_BITS_C + #define BN_MP_2EXPT_C + #define BN_MP_CLEAR_C + #define BN_S_MP_SUB_C +#endif + +#if defined(BN_MP_REDUCE_2K_SETUP_L_C) + #define BN_MP_INIT_C + #define BN_MP_2EXPT_C + #define BN_MP_COUNT_BITS_C + #define BN_S_MP_SUB_C + #define BN_MP_CLEAR_C +#endif + +#if defined(BN_MP_REDUCE_IS_2K_C) + #define BN_MP_REDUCE_2K_C + #define BN_MP_COUNT_BITS_C +#endif + +#if defined(BN_MP_REDUCE_IS_2K_L_C) +#endif + +#if defined(BN_MP_REDUCE_SETUP_C) + #define BN_MP_2EXPT_C + #define BN_MP_DIV_C +#endif + +#if defined(BN_MP_RSHD_C) + #define BN_MP_ZERO_C +#endif + +#if defined(BN_MP_SET_C) + #define BN_MP_ZERO_C +#endif + +#if defined(BN_MP_SET_INT_C) + #define BN_MP_ZERO_C + #define BN_MP_MUL_2D_C + #define BN_MP_CLAMP_C +#endif + +#if defined(BN_MP_SHRINK_C) +#endif + +#if defined(BN_MP_SIGNED_BIN_SIZE_C) + #define BN_MP_UNSIGNED_BIN_SIZE_C +#endif + +#if defined(BN_MP_SQR_C) + #define BN_MP_TOOM_SQR_C + #define BN_MP_KARATSUBA_SQR_C + #define BN_FAST_S_MP_SQR_C + #define BN_S_MP_SQR_C +#endif + +#if defined(BN_MP_SQRMOD_C) + #define BN_MP_INIT_C + #define BN_MP_SQR_C + #define BN_MP_CLEAR_C + #define BN_MP_MOD_C +#endif + +#if defined(BN_MP_SQRT_C) + #define BN_MP_N_ROOT_C + #define BN_MP_ISZERO_C + #define BN_MP_ZERO_C + #define BN_MP_INIT_COPY_C + #define BN_MP_RSHD_C + #define BN_MP_DIV_C + #define BN_MP_ADD_C + #define BN_MP_DIV_2_C + #define BN_MP_CMP_MAG_C + #define BN_MP_EXCH_C + #define BN_MP_CLEAR_C +#endif + +#if defined(BN_MP_SUB_C) + #define BN_S_MP_ADD_C + #define BN_MP_CMP_MAG_C + #define BN_S_MP_SUB_C +#endif + +#if defined(BN_MP_SUB_D_C) + #define BN_MP_GROW_C + #define BN_MP_ADD_D_C + #define BN_MP_CLAMP_C +#endif + +#if defined(BN_MP_SUBMOD_C) + #define BN_MP_INIT_C + #define BN_MP_SUB_C + #define BN_MP_CLEAR_C + #define BN_MP_MOD_C +#endif + +#if defined(BN_MP_TO_SIGNED_BIN_C) + #define BN_MP_TO_UNSIGNED_BIN_C +#endif + +#if defined(BN_MP_TO_SIGNED_BIN_N_C) + #define BN_MP_SIGNED_BIN_SIZE_C + #define BN_MP_TO_SIGNED_BIN_C +#endif + +#if defined(BN_MP_TO_UNSIGNED_BIN_C) + #define BN_MP_INIT_COPY_C + #define BN_MP_ISZERO_C + #define BN_MP_DIV_2D_C + #define BN_MP_CLEAR_C +#endif + +#if defined(BN_MP_TO_UNSIGNED_BIN_N_C) + #define BN_MP_UNSIGNED_BIN_SIZE_C + #define BN_MP_TO_UNSIGNED_BIN_C +#endif + +#if defined(BN_MP_TOOM_MUL_C) + #define BN_MP_INIT_MULTI_C + #define BN_MP_MOD_2D_C + #define BN_MP_COPY_C + #define BN_MP_RSHD_C + #define BN_MP_MUL_C + #define BN_MP_MUL_2_C + #define BN_MP_ADD_C + #define BN_MP_SUB_C + #define BN_MP_DIV_2_C + #define BN_MP_MUL_2D_C + #define BN_MP_MUL_D_C + #define BN_MP_DIV_3_C + #define BN_MP_LSHD_C + #define BN_MP_CLEAR_MULTI_C +#endif + +#if defined(BN_MP_TOOM_SQR_C) + #define BN_MP_INIT_MULTI_C + #define BN_MP_MOD_2D_C + #define BN_MP_COPY_C + #define BN_MP_RSHD_C + #define BN_MP_SQR_C + #define BN_MP_MUL_2_C + #define BN_MP_ADD_C + #define BN_MP_SUB_C + #define BN_MP_DIV_2_C + #define BN_MP_MUL_2D_C + #define BN_MP_MUL_D_C + #define BN_MP_DIV_3_C + #define BN_MP_LSHD_C + #define BN_MP_CLEAR_MULTI_C +#endif + +#if defined(BN_MP_TORADIX_C) + #define BN_MP_ISZERO_C + #define BN_MP_INIT_COPY_C + #define BN_MP_DIV_D_C + #define BN_MP_CLEAR_C + #define BN_MP_S_RMAP_C +#endif + +#if defined(BN_MP_TORADIX_N_C) + #define BN_MP_ISZERO_C + #define BN_MP_INIT_COPY_C + #define BN_MP_DIV_D_C + #define BN_MP_CLEAR_C + #define BN_MP_S_RMAP_C +#endif + +#if defined(BN_MP_UNSIGNED_BIN_SIZE_C) + #define BN_MP_COUNT_BITS_C +#endif + +#if defined(BN_MP_XOR_C) + #define BN_MP_INIT_COPY_C + #define BN_MP_CLAMP_C + #define BN_MP_EXCH_C + #define BN_MP_CLEAR_C +#endif + +#if defined(BN_MP_ZERO_C) +#endif + +#if defined(BN_PRIME_TAB_C) +#endif + +#if defined(BN_REVERSE_C) +#endif + +#if defined(BN_S_MP_ADD_C) + #define BN_MP_GROW_C + #define BN_MP_CLAMP_C +#endif + +#if defined(BN_S_MP_EXPTMOD_C) + #define BN_MP_COUNT_BITS_C + #define BN_MP_INIT_C + #define BN_MP_CLEAR_C + #define BN_MP_REDUCE_SETUP_C + #define BN_MP_REDUCE_C + #define BN_MP_REDUCE_2K_SETUP_L_C + #define BN_MP_REDUCE_2K_L_C + #define BN_MP_MOD_C + #define BN_MP_COPY_C + #define BN_MP_SQR_C + #define BN_MP_MUL_C + #define BN_MP_SET_C + #define BN_MP_EXCH_C +#endif + +#if defined(BN_S_MP_MUL_DIGS_C) + #define BN_FAST_S_MP_MUL_DIGS_C + #define BN_MP_INIT_SIZE_C + #define BN_MP_CLAMP_C + #define BN_MP_EXCH_C + #define BN_MP_CLEAR_C +#endif + +#if defined(BN_S_MP_MUL_HIGH_DIGS_C) + #define BN_FAST_S_MP_MUL_HIGH_DIGS_C + #define BN_MP_INIT_SIZE_C + #define BN_MP_CLAMP_C + #define BN_MP_EXCH_C + #define BN_MP_CLEAR_C +#endif + +#if defined(BN_S_MP_SQR_C) + #define BN_MP_INIT_SIZE_C + #define BN_MP_CLAMP_C + #define BN_MP_EXCH_C + #define BN_MP_CLEAR_C +#endif + +#if defined(BN_S_MP_SUB_C) + #define BN_MP_GROW_C + #define BN_MP_CLAMP_C +#endif + +#if defined(BNCORE_C) +#endif + +#ifdef LTM3 +#define LTM_LAST +#endif +#include <tommath_superclass.h> +#include <tommath_class.h> +#else +#define LTM_LAST +#endif + +/* $Source: /cvs/libtom/libtommath/tommath_class.h,v $ */ +/* $Revision: 1.3 $ */ +/* $Date: 2005/07/28 11:59:32 $ */ diff --git a/package/heimdal/src/lib/hcrypto/libtommath/tommath_superclass.h b/package/heimdal/src/lib/hcrypto/libtommath/tommath_superclass.h new file mode 100644 index 000000000..2fdebe683 --- /dev/null +++ b/package/heimdal/src/lib/hcrypto/libtommath/tommath_superclass.h @@ -0,0 +1,76 @@ +/* super class file for PK algos */ + +/* default ... include all MPI */ +#define LTM_ALL + +/* RSA only (does not support DH/DSA/ECC) */ +/* #define SC_RSA_1 */ + +/* For reference.... On an Athlon64 optimizing for speed... + + LTM's mpi.o with all functions [striped] is 142KiB in size. + +*/ + +/* Works for RSA only, mpi.o is 68KiB */ +#ifdef SC_RSA_1 + #define BN_MP_SHRINK_C + #define BN_MP_LCM_C + #define BN_MP_PRIME_RANDOM_EX_C + #define BN_MP_INVMOD_C + #define BN_MP_GCD_C + #define BN_MP_MOD_C + #define BN_MP_MULMOD_C + #define BN_MP_ADDMOD_C + #define BN_MP_EXPTMOD_C + #define BN_MP_SET_INT_C + #define BN_MP_INIT_MULTI_C + #define BN_MP_CLEAR_MULTI_C + #define BN_MP_UNSIGNED_BIN_SIZE_C + #define BN_MP_TO_UNSIGNED_BIN_C + #define BN_MP_MOD_D_C + #define BN_MP_PRIME_RABIN_MILLER_TRIALS_C + #define BN_REVERSE_C + #define BN_PRIME_TAB_C + + /* other modifiers */ + #define BN_MP_DIV_SMALL /* Slower division, not critical */ + + /* here we are on the last pass so we turn things off. The functions classes are still there + * but we remove them specifically from the build. This also invokes tweaks in functions + * like removing support for even moduli, etc... + */ +#ifdef LTM_LAST + #undef BN_MP_TOOM_MUL_C + #undef BN_MP_TOOM_SQR_C + #undef BN_MP_KARATSUBA_MUL_C + #undef BN_MP_KARATSUBA_SQR_C + #undef BN_MP_REDUCE_C + #undef BN_MP_REDUCE_SETUP_C + #undef BN_MP_DR_IS_MODULUS_C + #undef BN_MP_DR_SETUP_C + #undef BN_MP_DR_REDUCE_C + #undef BN_MP_REDUCE_IS_2K_C + #undef BN_MP_REDUCE_2K_SETUP_C + #undef BN_MP_REDUCE_2K_C + #undef BN_S_MP_EXPTMOD_C + #undef BN_MP_DIV_3_C + #undef BN_S_MP_MUL_HIGH_DIGS_C + #undef BN_FAST_S_MP_MUL_HIGH_DIGS_C + #undef BN_FAST_MP_INVMOD_C + + /* To safely undefine these you have to make sure your RSA key won't exceed the Comba threshold + * which is roughly 255 digits [7140 bits for 32-bit machines, 15300 bits for 64-bit machines] + * which means roughly speaking you can handle upto 2536-bit RSA keys with these defined without + * trouble. + */ + #undef BN_S_MP_MUL_DIGS_C + #undef BN_S_MP_SQR_C + #undef BN_MP_MONTGOMERY_REDUCE_C +#endif + +#endif + +/* $Source: /cvs/libtom/libtommath/tommath_superclass.h,v $ */ +/* $Revision: 1.3 $ */ +/* $Date: 2005/05/14 13:29:17 $ */ diff --git a/package/hostapd/Makefile b/package/hostapd/Makefile index f57192c27..8e39c52b9 100644 --- a/package/hostapd/Makefile +++ b/package/hostapd/Makefile @@ -16,7 +16,7 @@ PKG_SITES:= http://hostap.epitest.fi/releases/ PKG_MULTI:= 1 PKG_SUBPKGS:= HOSTAPD HOSTAPD_UTILS -PKG_CHOICES:= WITH_OPENSSL WITH_GNUTLS +PKG_CHOICES_HOSTAPD:= WITH_OPENSSL WITH_GNUTLS PKGCD_WITH_OPENSSL:= use OpenSSL for crypto PKGCS_WITH_OPENSSL:= libopenssl PKGCB_WITH_OPENSSL:= openssl 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/id3lib/Makefile b/package/id3lib/Makefile index 17c92c1be..3a20f34d6 100644 --- a/package/id3lib/Makefile +++ b/package/id3lib/Makefile @@ -13,6 +13,7 @@ PKG_DEPENDS:= zlib libiconv PKG_BUILDDEP:= zlib libiconv PKG_URL:= http://id3lib.sourceforge.net/ PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=id3lib/} +PKG_NEED_CXX:= 1 PKG_CXX:= ID3LIB include ${TOPDIR}/mk/package.mk @@ -22,10 +23,15 @@ $(eval $(call PKG_template,ID3LIB,id3lib,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEP TCFLAGS+= -fPIC CONFIGURE_ARGS+= --enable-cxx-warnings=no +LIBRARIES:=-nodefaultlibs -luClibc++ -lz -lm -lc +ifeq ($(ADK_TOOLCHAIN_GCC_USE_SSP),y) +LIBRARIES+=-lssp -fstack-protector +endif + ifeq ($(ADK_COMPILE_ID3LIB_WITH_UCLIBCXX),y) TCXXFLAGS+= -fno-builtin -fno-rtti -nostdinc++ \ -I${STAGING_TARGET_DIR}/usr/include/uClibc++ -CONFIGURE_ENV+= LIBS="-nodefaultlibs -luClibc++ -lz -lm -lc" +CONFIGURE_ENV+= LIBS="${LIBRARIES}" else TLDFLAGS+= -shared endif diff --git a/package/id3lib/patches/patch-ltmain_sh b/package/id3lib/patches/patch-ltmain_sh new file mode 100644 index 000000000..32b0e7b55 --- /dev/null +++ b/package/id3lib/patches/patch-ltmain_sh @@ -0,0 +1,22 @@ +--- id3lib-3.8.3.orig/ltmain.sh 2003-03-02 01:23:00.000000000 +0100 ++++ id3lib-3.8.3/ltmain.sh 2011-01-15 19:06:56.000000000 +0100 +@@ -1065,6 +1065,19 @@ compiler." + continue + ;; + ++ -fstack-protector*|-flto) ++ arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"` ++ case $arg in ++ *$quote_scanset* | *]* | *\|* | *\&* | *\(* | *\)* | "") ++ arg="\"$arg\"" ++ ;; ++ esac ++ compile_command="$compile_command $arg" ++ finalize_command="$finalize_command $arg" ++ compiler_flags="$compiler_flags $arg" ++ continue ++ ;; ++ + -no-fast-install) + fast_install=no + continue diff --git a/package/imlib2/patches/patch-ltmain_sh b/package/imlib2/patches/patch-ltmain_sh new file mode 100644 index 000000000..0abed66c0 --- /dev/null +++ b/package/imlib2/patches/patch-ltmain_sh @@ -0,0 +1,11 @@ +--- imlib2-1.4.4.orig/ltmain.sh 2010-05-05 20:26:26.000000000 +0200 ++++ imlib2-1.4.4/ltmain.sh 2011-01-15 11:42:11.000000000 +0100 +@@ -4765,7 +4765,7 @@ func_mode_link () + # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC + # @file GCC response files + -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) + func_quote_for_eval "$arg" + arg="$func_quote_for_eval_result" + func_append compile_command " $arg" diff --git a/package/ipcad/patches/patch-Makefile_in b/package/ipcad/patches/patch-Makefile_in new file mode 100644 index 000000000..40bcdf546 --- /dev/null +++ b/package/ipcad/patches/patch-Makefile_in @@ -0,0 +1,17 @@ +--- ipcad-3.7.3.orig/Makefile.in 2007-04-22 10:08:45.000000000 +0200 ++++ ipcad-3.7.3/Makefile.in 2011-01-11 17:16:15.000000000 +0100 +@@ -6,10 +6,10 @@ sysconfdir= @sysconfdir@ + datadir= @datadir@ + + CC= @CC@ +-LDFLAGS+= @LDFLAGS@ +-LIBS+= @LIBS@ +-CFLAGS+= @CFLAGS@ @DEFS@ -W -Wall +-CPPFLAGS+=-DIPCAD_VERSION=\"@IPCAD_VERSION@\" ++LDFLAGS= @LDFLAGS@ ++LIBS= @LIBS@ ++CFLAGS= @CFLAGS@ @DEFS@ -W -Wall ++CPPFLAGS=-DIPCAD_VERSION=\"@IPCAD_VERSION@\" + CPPFLAGS+=-DCONFIG_FILE=\"${sysconfdir}/ipcad.conf\" + CPPFLAGS+=@DEFS@ -D_REENTRANT -D_THREAD_SAFE + CPPFLAGS+=-DPSRC_@PSRC@ -DIFST_@IFST@ diff --git a/package/iperf/Makefile b/package/iperf/Makefile index 7a4f70994..a8db48d59 100644 --- a/package/iperf/Makefile +++ b/package/iperf/Makefile @@ -12,12 +12,17 @@ PKG_SECTION:= net PKG_DEPENDS:= libpthread PKG_URL:= http://sourceforge.net/projects/iperf PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=iperf/} +PKG_NEED_CXX:= 1 PKG_CXX:= IPERF include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,IPERF,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +ifeq ($(ADK_TOOLCHAIN_GCC_USE_SSP),y) +TLDFLAGS+= -lssp +endif + ifeq ($(ADK_COMPILE_IPERF_WITH_UCLIBCXX),y) TCXXFLAGS+= -fno-builtin -fno-rtti -nostdinc++ TLDFLAGS+= -nodefaultlibs diff --git a/package/iproute2/Makefile b/package/iproute2/Makefile index 8ffc0ddb0..f0c815e59 100644 --- a/package/iproute2/Makefile +++ b/package/iproute2/Makefile @@ -4,9 +4,9 @@ include ${TOPDIR}/rules.mk PKG_NAME:= iproute2 -PKG_VERSION:= 2.6.34 +PKG_VERSION:= 2.6.37 PKG_RELEASE:= 1 -PKG_MD5SUM:= 5c5742bdac05a1688f266512e685b83c +PKG_MD5SUM:= 9774ff9d74ebd301bf56bd8d74473786 PKG_DESCR:= iproute2 routing control utility PKG_SECTION:= route PKG_URL:= http://www.linuxfoundation.org/en/Net:Iproute2 @@ -15,6 +15,7 @@ PKG_SITES:= http://devresources.linuxfoundation.org/dev/iproute2/download/ PKG_SUBPKGS:= IP TC TC_ATM IFSTAT LNSTAT ROUTEL RTMON SS PKGSD_TC:= iproute2 traffic control utility PKGSS_TC:= kmod-sched +PKGSB_TC:= iptables PKGSD_TC_ATM:= iproute2 traffic control ATM support library PKGSS_TC_ATM:= tc libatm PKGSB_TC_ATM:= linux-atm @@ -40,57 +41,48 @@ $(eval $(call PKG_template,SS,ss,${PKG_VERSION}-${PKG_RELEASE},,${PKGSD_SS},${PK TCFLAGS+= -D_GNU_SOURCE XAKE_FLAGS+= CCOPTS="${TCFLAGS}" MFLAGS="CC=${TARGET_CC}" \ HOSTCFLAGS="-I${LINUX_HEADER_DIR}/include" - CONFIGURE_FLAGS+= KERNEL_INCLUDE="${LINUX_DIR}/include" -INSTALL_y:= -INSTALL_m:= -INSTALL_${ADK_PACKAGE_IP}:= install-ip -INSTALL_${ADK_PACKAGE_TC}:= install-tc -INSTALL_${ADK_PACKAGE_TC_ATM}:= install-tc-atm -INSTALL_${ADK_PACKAGE_IFSTAT}:= install-ifstat -INSTALL_${ADK_PACKAGE_LNSTAT}:= install-lnstat -INSTALL_${ADK_PACKAGE_ROUTEL}:= install-routel -INSTALL_${ADK_PACKAGE_RTMON}:= install-rtmon -INSTALL_${ADK_PACKAGE_SS}:= install-ss - -post-install: ${INSTALL_y} ${INSTALL_m} +post-configure: + $(CP) ./files/Config $(WRKBUILD)/ -install-ip: +ip-install: ${INSTALL_DIR} ${IDIR_IP}/{etc/iproute2,usr/sbin} ${INSTALL_DATA} ${WRKINST}/etc/iproute2/* ${IDIR_IP}/etc/iproute2/ ${INSTALL_BIN} ${WRKINST}/sbin/ip ${IDIR_IP}/usr/sbin/ip -install-tc: - ${INSTALL_DIR} ${IDIR_TC}/{lib/tc,usr/sbin} - ${INSTALL_DATA} ${WRKINST}/lib/tc/* ${IDIR_TC}/lib/tc/ +tc-install: + ${INSTALL_DIR} ${IDIR_TC}/{lib/tc,usr/sbin,usr/lib/tc} + # use ${CP} here, since m_ipt.so is a symlink to m_xt.so + ${CP} ${WRKINST}/lib/tc/m_*.so ${IDIR_TC}/lib/tc/ + ${CP} ${WRKINST}/usr/lib/tc/*.dist ${IDIR_TC}/usr/lib/tc/ ${INSTALL_BIN} ${WRKINST}/sbin/tc ${IDIR_TC}/usr/sbin/ -install-tc-atm: - ${INSTALL_DIR} ${IDIR_TC_ATM}/usr/lib/tc - ${INSTALL_DATA} ${WRKINST}/usr/lib/tc/q_atm.so \ - ${IDIR_TC_ATM}/usr/lib/tc/ +tc-atm-install: + ${INSTALL_DIR} ${IDIR_TC_ATM}/lib/tc + ${INSTALL_DATA} ${WRKINST}/lib/tc/q_atm.so \ + ${IDIR_TC_ATM}/lib/tc/ -install-ifstat: +ifstat-install: ${INSTALL_DIR} ${IDIR_IFSTAT}/usr/sbin ${INSTALL_BIN} ${WRKINST}/sbin/ifstat ${IDIR_IFSTAT}/usr/sbin -install-lnstat: +lnstat-install: ${INSTALL_DIR} ${IDIR_LNSTAT}/usr/sbin ${INSTALL_BIN} ${WRKINST}/sbin/{ln,n}stat ${IDIR_LNSTAT}/usr/sbin ln -sf lnstat ${IDIR_LNSTAT}/usr/sbin/rtstat ln -sf lnstat ${IDIR_LNSTAT}/usr/sbin/ctstat ${INSTALL_BIN} ${WRKINST}/sbin/rtacct ${IDIR_LNSTAT}/usr/sbin -install-routel: +routel-install: ${INSTALL_DIR} ${IDIR_ROUTEL}/usr/sbin ${INSTALL_BIN} ${WRKINST}/sbin/route{l,f} ${IDIR_ROUTEL}/usr/sbin -install-rtmon: +rtmon-install: ${INSTALL_DIR} ${IDIR_RTMON}/usr/sbin ${INSTALL_BIN} ${WRKINST}/sbin/rtmon ${IDIR_RTMON}/usr/sbin -install-ss: +ss-install: ${INSTALL_DIR} ${IDIR_SS}/usr/sbin ${INSTALL_BIN} ${WRKINST}/sbin/ss ${IDIR_SS}/usr/sbin diff --git a/package/iproute2/files/Config b/package/iproute2/files/Config new file mode 100644 index 000000000..0ba7d387d --- /dev/null +++ b/package/iproute2/files/Config @@ -0,0 +1,2 @@ +TC_CONFIG_ATM:=y +TC_CONFIG_XT:=y diff --git a/package/ipsec-tools/Makefile b/package/ipsec-tools/Makefile index 5e92467cd..f9f2c13d6 100644 --- a/package/ipsec-tools/Makefile +++ b/package/ipsec-tools/Makefile @@ -16,8 +16,8 @@ PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=ipsec-tools/} DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 -PKG_FLAVOURS:= WITH_IPV6 -PKGFD_WITH_IPV6:= enable IPv6 support +PKG_FLAVOURS_IPSEC_TOOLS:= WITH_IPV6 +PKGFD_WITH_IPV6:= enable IPv6 support include ${TOPDIR}/mk/package.mk diff --git a/package/ipsec-tools/patches/patch-ltmain_sh b/package/ipsec-tools/patches/patch-ltmain_sh new file mode 100644 index 000000000..f0e98067d --- /dev/null +++ b/package/ipsec-tools/patches/patch-ltmain_sh @@ -0,0 +1,11 @@ +--- ipsec-tools-0.7.2.orig/ltmain.sh 2009-04-21 16:41:43.000000000 +0200 ++++ ipsec-tools-0.7.2/ltmain.sh 2011-01-15 21:50:23.000000000 +0100 +@@ -4238,7 +4238,7 @@ func_mode_link () + # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC + # @file GCC response files + -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) + func_quote_for_eval "$arg" + arg="$func_quote_for_eval_result" + func_append compile_command " $arg" diff --git a/package/ipset/Makefile b/package/ipset/Makefile index ff8a0399b..01ba6a8ee 100644 --- a/package/ipset/Makefile +++ b/package/ipset/Makefile @@ -12,16 +12,16 @@ PKG_SECTION:= firewall PKG_URL:= http://ipset.netfilter.org/ PKG_SITES:= http://ipset.netfilter.org/ -PKG_SUBPKGS:= IPSET KMOD_IPSET -PKGSD_KMOD_IPSET:= ipset kernel module -PKGSC_KMOD_IPSET:= kernel +PKG_SUBPKGS:= IPSET IPSET_KMOD +PKGSD_IPSET_KMOD:= ipset kernel module +PKGSC_IPSET_KMOD:= kernel DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,IPSET,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -$(eval $(call PKG_template,KMOD_IPSET,kmod-ipset,${KERNEL_VERSION}+${PKG_VERSION}-${ADK_TARGET}-${PKG_RELEASE},,${PKGSD_KMOD_IPSET},${PKGSC_KMOD_IPSET})) +$(eval $(call PKG_template,IPSET_KMOD,ipset-kmod,${KERNEL_VERSION}+${PKG_VERSION}-${ADK_TARGET}-${PKG_RELEASE},,${PKGSD_IPSET_KMOD},${PKGSC_IPSET_KMOD})) CONFIG_STYLE:= manual XAKE_FLAGS+= PREFIX=/usr @@ -39,8 +39,8 @@ post-install: ${INSTALL_BIN} ${WRKINST}/usr/sbin/ipset ${IDIR_IPSET}/usr/sbin ${CP} ${WRKINST}/usr/lib/ipset/*.so ${IDIR_IPSET}/usr/lib/ipset/ # kernel modules (no autoload at the moment) - ${INSTALL_DIR} ${IDIR_KMOD_IPSET}/lib/modules/${KERNEL_VERSION}/ + ${INSTALL_DIR} ${IDIR_IPSET_KMOD}/lib/modules/${KERNEL_VERSION}/ ${INSTALL_DATA} ${WRKBUILD}/kernel/*.ko \ - ${IDIR_KMOD_IPSET}/lib/modules/${KERNEL_VERSION} + ${IDIR_IPSET_KMOD}/lib/modules/${KERNEL_VERSION} include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/iptables-snmp/patches/patch-Makefile_in b/package/iptables-snmp/patches/patch-Makefile_in new file mode 100644 index 000000000..164003986 --- /dev/null +++ b/package/iptables-snmp/patches/patch-Makefile_in @@ -0,0 +1,11 @@ +--- iptables-snmp-0.1.orig/Makefile.in 2005-11-02 13:00:10.000000000 +0100 ++++ iptables-snmp-0.1/Makefile.in 2011-01-12 15:44:48.000000000 +0100 +@@ -67,7 +67,7 @@ OTHER = -Iinclude -DIPTABLES_VERSION=$( + + all: iptables-snmp.so + +-iptables-snmp.so: $(OBJS) libiptc.a Makefile ++iptables-snmp.so: $(OBJS) Makefile + $(CC) $(CFLAGS) $(OTHER) $(DFLAGS) -shared -o $@ $(OBJS) $(LDFLAGS) + + libiptc.a: $(LIBIPTC_OBJS) Makefile diff --git a/package/iptables-snmp/patches/patch-iptables-snmp_c b/package/iptables-snmp/patches/patch-iptables-snmp_c new file mode 100644 index 000000000..c129ff0e9 --- /dev/null +++ b/package/iptables-snmp/patches/patch-iptables-snmp_c @@ -0,0 +1,12 @@ +--- iptables-snmp-0.1.orig/iptables-snmp.c 2005-11-02 12:10:54.000000000 +0100 ++++ iptables-snmp-0.1/iptables-snmp.c 2011-01-12 15:46:19.000000000 +0100 +@@ -37,6 +37,9 @@ + + #include "libiptc/libiptc.h" + ++/* For backward compatibility */ ++//typedef struct iptc_handle *iptc_handle_t; ++ + static oid agent_version_oid[] = { + BASE_OID, 1, 0, AGENT_VERSION_INDEX + }; diff --git a/package/iptables/Makefile b/package/iptables/Makefile index aac6179a0..e20e117c5 100644 --- a/package/iptables/Makefile +++ b/package/iptables/Makefile @@ -4,9 +4,9 @@ include ${TOPDIR}/rules.mk PKG_NAME:= iptables -PKG_VERSION:= 1.4.8 +PKG_VERSION:= 1.4.10 PKG_RELEASE:= 1 -PKG_MD5SUM:= 697ed89f37af4473a5f6349ba2700f2d +PKG_MD5SUM:= f382fe693f0b59d87bd47bea65eca198 PKG_DESCR:= The netfilter firewalling software PKG_SECTION:= firewall PKG_DEPENDS:= kmod-ip-nf-iptables kmod-nf-conntrack @@ -17,10 +17,7 @@ PKG_DEPENDS+= kmod-netfilter-xt-target-tcpmss PKG_DEPENDS6:= kmod-ip6-nf-iptables kmod-nf-conntrack-ipv6 PKG_DEPENDS6+= kmod-ip6-nf-filter kmod-ip6-nf-target-reject PKG_URL:= http://www.netfilter.org -PKG_SITES:= http://www.netfilter.org/projects/iptables/files/ \ - ftp://ftp.be.netfilter.org/pub/netfilter/iptables/ \ - ftp://ftp.de.netfilter.org/pub/netfilter/iptables/ \ - ftp://ftp.no.netfilter.org/pub/netfilter/iptables/ +PKG_SITES:= http://www.netfilter.org/projects/iptables/files/ PKG_SUBPKGS:= IPTABLES IP6TABLES @@ -37,9 +34,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/iptables/patches/patch-ltmain_sh b/package/iptables/patches/patch-ltmain_sh new file mode 100644 index 000000000..fa93f8a96 --- /dev/null +++ b/package/iptables/patches/patch-ltmain_sh @@ -0,0 +1,11 @@ +--- iptables-1.4.10.orig/ltmain.sh 2010-10-29 16:40:34.000000000 +0200 ++++ iptables-1.4.10/ltmain.sh 2011-01-15 21:45:03.000000000 +0100 +@@ -4765,7 +4765,7 @@ func_mode_link () + # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC + # @file GCC response files + -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) + func_quote_for_eval "$arg" + arg="$func_quote_for_eval_result" + func_append compile_command " $arg" diff --git a/package/iptraf/Makefile b/package/iptraf/Makefile index 98f9e9b5d..ef289ae37 100644 --- a/package/iptraf/Makefile +++ b/package/iptraf/Makefile @@ -28,7 +28,7 @@ do-build: CFLAGS="${TARGET_CFLAGS}" \ DEBUG="" \ INCLUDEDIR="-I../support -I${STAGING_TARGET_DIR}/usr/include" \ - LDOPTS="-L${STAGING_TARGET_DIR}/usr/lib -L${STAGING_TARGET_DIR}/lib" \ + LDOPTS="${TARGET_LDFLAGS}" \ PLATFORM="-DPLATFORM=\\\"Linux/${ARCH}\\\"" \ TARGET="/usr/bin" \ WORKDIR="/var/lib/iptraf" \ diff --git a/package/irssi/Makefile b/package/irssi/Makefile index 55894fd7c..32efe957a 100644 --- a/package/irssi/Makefile +++ b/package/irssi/Makefile @@ -14,7 +14,7 @@ PKG_BUILDDEP:= glib ncurses PKG_URL:= http://www.irssi.org/ PKG_SITES:= http://www.irssi.org/files/ -PKG_FLAVOURS:= WITH_SSL WITH_IPV6 +PKG_FLAVOURS_IRSSI:= WITH_SSL WITH_IPV6 PKGFD_WITH_SSL:= enable SSL/TLS support PKGFS_WITH_SSL:= libopenssl PKGFB_WITH_SSL:= openssl 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/jamvm/patches/patch-ltmain_sh b/package/jamvm/patches/patch-ltmain_sh new file mode 100644 index 000000000..e7a6c8f5d --- /dev/null +++ b/package/jamvm/patches/patch-ltmain_sh @@ -0,0 +1,11 @@ +--- jamvm-1.5.4.orig/ltmain.sh 2009-01-03 07:08:36.000000000 +0100 ++++ jamvm-1.5.4/ltmain.sh 2011-01-15 22:06:10.000000000 +0100 +@@ -1676,7 +1676,7 @@ EOF + # -F/path gives path to uninstalled frameworks, gcc on darwin + # @file GCC response files + -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) + + # Unknown arguments in both finalize_command and compile_command need + # to be aesthetically quoted because they are evaled later. 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/jpeg/patches/patch-ltmain_sh b/package/jpeg/patches/patch-ltmain_sh new file mode 100644 index 000000000..3b71ada5f --- /dev/null +++ b/package/jpeg/patches/patch-ltmain_sh @@ -0,0 +1,11 @@ +--- jpeg-8b.orig/ltmain.sh 2010-05-02 18:49:25.000000000 +0200 ++++ jpeg-8b/ltmain.sh 2011-01-14 00:16:39.000000000 +0100 +@@ -4765,7 +4765,7 @@ func_mode_link () + # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC + # @file GCC response files + -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) + func_quote_for_eval "$arg" + arg="$func_quote_for_eval_result" + func_append compile_command " $arg" 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/lame/patches/patch-ltmain_sh b/package/lame/patches/patch-ltmain_sh new file mode 100644 index 000000000..04a015282 --- /dev/null +++ b/package/lame/patches/patch-ltmain_sh @@ -0,0 +1,11 @@ +--- lame-398-2.orig/ltmain.sh 2008-01-03 01:00:01.000000000 +0100 ++++ lame-398-2/ltmain.sh 2011-01-15 22:13:38.000000000 +0100 +@@ -1693,7 +1693,7 @@ EOF + # -F/path gives path to uninstalled frameworks, gcc on darwin + # @file GCC response files + -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) + + # Unknown arguments in both finalize_command and compile_command need + # to be aesthetically quoted because they are evaled later. diff --git a/package/libICE/patches/patch-ltmain_sh b/package/libICE/patches/patch-ltmain_sh new file mode 100644 index 000000000..92bc5c02d --- /dev/null +++ b/package/libICE/patches/patch-ltmain_sh @@ -0,0 +1,11 @@ +--- libICE-1.0.6.orig/ltmain.sh 2009-05-18 04:30:07.000000000 +0200 ++++ libICE-1.0.6/ltmain.sh 2011-01-15 00:09:27.000000000 +0100 +@@ -4765,7 +4765,7 @@ func_mode_link () + # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC + # @file GCC response files + -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) + func_quote_for_eval "$arg" + arg="$func_quote_for_eval_result" + func_append compile_command " $arg" diff --git a/package/libSM/patches/patch-ltmain_sh b/package/libSM/patches/patch-ltmain_sh new file mode 100644 index 000000000..f01192003 --- /dev/null +++ b/package/libSM/patches/patch-ltmain_sh @@ -0,0 +1,11 @@ +--- libSM-1.1.1.orig/ltmain.sh 2009-08-07 14:22:14.000000000 +0200 ++++ libSM-1.1.1/ltmain.sh 2011-01-15 00:11:06.000000000 +0100 +@@ -4772,7 +4772,7 @@ func_mode_link () + # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC + # @file GCC response files + -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) + func_quote_for_eval "$arg" + arg="$func_quote_for_eval_result" + func_append compile_command " $arg" 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/libX11/patches/patch-ltmain_sh b/package/libX11/patches/patch-ltmain_sh new file mode 100644 index 000000000..d88493e60 --- /dev/null +++ b/package/libX11/patches/patch-ltmain_sh @@ -0,0 +1,11 @@ +--- libX11-1.3.2.orig/ltmain.sh 2009-10-17 07:26:21.000000000 +0200 ++++ libX11-1.3.2/ltmain.sh 2011-01-14 00:51:57.000000000 +0100 +@@ -1676,7 +1676,7 @@ EOF + # -F/path gives path to uninstalled frameworks, gcc on darwin + # @file GCC response files + -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) + + # Unknown arguments in both finalize_command and compile_command need + # to be aesthetically quoted because they are evaled later. 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/libXau/patches/patch-ltmain_sh b/package/libXau/patches/patch-ltmain_sh new file mode 100644 index 000000000..065bd8d32 --- /dev/null +++ b/package/libXau/patches/patch-ltmain_sh @@ -0,0 +1,11 @@ +--- libXau-1.0.5.orig/ltmain.sh 2009-05-18 04:20:07.000000000 +0200 ++++ libXau-1.0.5/ltmain.sh 2011-01-14 00:48:29.000000000 +0100 +@@ -4765,7 +4765,7 @@ func_mode_link () + # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC + # @file GCC response files + -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) + func_quote_for_eval "$arg" + arg="$func_quote_for_eval_result" + func_append compile_command " $arg" diff --git a/package/libXaw/patches/patch-ltmain_sh b/package/libXaw/patches/patch-ltmain_sh new file mode 100644 index 000000000..d5ae40796 --- /dev/null +++ b/package/libXaw/patches/patch-ltmain_sh @@ -0,0 +1,11 @@ +--- libXaw-1.0.7.orig/ltmain.sh 2009-10-17 07:26:21.000000000 +0200 ++++ libXaw-1.0.7/ltmain.sh 2011-01-15 22:19:32.000000000 +0100 +@@ -1676,7 +1676,7 @@ EOF + # -F/path gives path to uninstalled frameworks, gcc on darwin + # @file GCC response files + -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) + + # Unknown arguments in both finalize_command and compile_command need + # to be aesthetically quoted because they are evaled later. 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/libXcursor/patches/patch-ltmain_sh b/package/libXcursor/patches/patch-ltmain_sh new file mode 100644 index 000000000..e78e57231 --- /dev/null +++ b/package/libXcursor/patches/patch-ltmain_sh @@ -0,0 +1,11 @@ +--- libXcursor-1.1.11.orig/ltmain.sh 2010-10-28 07:48:42.000000000 +0200 ++++ libXcursor-1.1.11/ltmain.sh 2011-01-15 22:22:45.000000000 +0100 +@@ -5091,7 +5091,7 @@ func_mode_link () + # @file GCC response files + # -tp=* Portland pgcc target processor selection + -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \ +- -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*) ++ -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|-fstack-protector*|-flto) + func_quote_for_eval "$arg" + arg="$func_quote_for_eval_result" + func_append compile_command " $arg" 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/libXdmcp/patches/patch-ltmain_sh b/package/libXdmcp/patches/patch-ltmain_sh new file mode 100644 index 000000000..3000778e3 --- /dev/null +++ b/package/libXdmcp/patches/patch-ltmain_sh @@ -0,0 +1,11 @@ +--- libXdmcp-1.0.3.orig/ltmain.sh 2009-05-18 04:20:38.000000000 +0200 ++++ libXdmcp-1.0.3/ltmain.sh 2011-01-14 00:47:12.000000000 +0100 +@@ -4765,7 +4765,7 @@ func_mode_link () + # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC + # @file GCC response files + -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) + func_quote_for_eval "$arg" + arg="$func_quote_for_eval_result" + func_append compile_command " $arg" 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/libXext/patches/patch-ltmain_sh b/package/libXext/patches/patch-ltmain_sh new file mode 100644 index 000000000..c82710166 --- /dev/null +++ b/package/libXext/patches/patch-ltmain_sh @@ -0,0 +1,11 @@ +--- libXext-1.1.1.orig/ltmain.sh 2009-10-17 07:26:21.000000000 +0200 ++++ libXext-1.1.1/ltmain.sh 2011-01-14 01:11:30.000000000 +0100 +@@ -1676,7 +1676,7 @@ EOF + # -F/path gives path to uninstalled frameworks, gcc on darwin + # @file GCC response files + -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) + + # Unknown arguments in both finalize_command and compile_command need + # to be aesthetically quoted because they are evaled later. diff --git a/package/libXfont/patches/patch-ltmain_sh b/package/libXfont/patches/patch-ltmain_sh new file mode 100644 index 000000000..d901e8b34 --- /dev/null +++ b/package/libXfont/patches/patch-ltmain_sh @@ -0,0 +1,11 @@ +--- libXfont-1.4.1.orig/ltmain.sh 2009-09-11 16:54:52.000000000 +0200 ++++ libXfont-1.4.1/ltmain.sh 2011-01-15 22:27:42.000000000 +0100 +@@ -1676,7 +1676,7 @@ EOF + # -F/path gives path to uninstalled frameworks, gcc on darwin + # @file GCC response files + -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) + + # Unknown arguments in both finalize_command and compile_command need + # to be aesthetically quoted because they are evaled later. diff --git a/package/libXft/patches/patch-ltmain_sh b/package/libXft/patches/patch-ltmain_sh new file mode 100644 index 000000000..ea3857e71 --- /dev/null +++ b/package/libXft/patches/patch-ltmain_sh @@ -0,0 +1,11 @@ +--- libXft-2.1.9.orig/ltmain.sh 2006-01-10 16:23:50.000000000 +0100 ++++ libXft-2.1.9/ltmain.sh 2011-01-15 22:30:29.000000000 +0100 +@@ -1623,7 +1623,7 @@ EOF + # -pg pass through profiling flag for GCC + # @file GCC response files + -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*|-pg| \ +- -t[45]*|-txscale*|@*) ++ -t[45]*|-txscale*|@*|-fstack-protector*|-flto) + + # Unknown arguments in both finalize_command and compile_command need + # to be aesthetically quoted because they are evaled later. diff --git a/package/libXi/patches/patch-ltmain_sh b/package/libXi/patches/patch-ltmain_sh new file mode 100644 index 000000000..86a276fc3 --- /dev/null +++ b/package/libXi/patches/patch-ltmain_sh @@ -0,0 +1,11 @@ +--- libXi-1.3.orig/ltmain.sh 2009-10-02 04:21:36.000000000 +0200 ++++ libXi-1.3/ltmain.sh 2011-01-14 21:38:48.000000000 +0100 +@@ -4765,7 +4765,7 @@ func_mode_link () + # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC + # @file GCC response files + -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) + func_quote_for_eval "$arg" + arg="$func_quote_for_eval_result" + func_append compile_command " $arg" diff --git a/package/libXmu/patches/patch-ltmain_sh b/package/libXmu/patches/patch-ltmain_sh new file mode 100644 index 000000000..f748db34e --- /dev/null +++ b/package/libXmu/patches/patch-ltmain_sh @@ -0,0 +1,11 @@ +--- libXmu-1.0.5.orig/ltmain.sh 2009-09-11 16:54:52.000000000 +0200 ++++ libXmu-1.0.5/ltmain.sh 2011-01-15 22:16:42.000000000 +0100 +@@ -1676,7 +1676,7 @@ EOF + # -F/path gives path to uninstalled frameworks, gcc on darwin + # @file GCC response files + -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) + + # Unknown arguments in both finalize_command and compile_command need + # to be aesthetically quoted because they are evaled later. diff --git a/package/libXpm/patches/patch-ltmain_sh b/package/libXpm/patches/patch-ltmain_sh new file mode 100644 index 000000000..69f53a236 --- /dev/null +++ b/package/libXpm/patches/patch-ltmain_sh @@ -0,0 +1,11 @@ +--- libXpm-3.5.8.orig/ltmain.sh 2009-09-11 16:54:52.000000000 +0200 ++++ libXpm-3.5.8/ltmain.sh 2011-01-15 11:27:44.000000000 +0100 +@@ -1676,7 +1676,7 @@ EOF + # -F/path gives path to uninstalled frameworks, gcc on darwin + # @file GCC response files + -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) + + # Unknown arguments in both finalize_command and compile_command need + # to be aesthetically quoted because they are evaled later. diff --git a/package/libXt/patches/patch-ltmain_sh b/package/libXt/patches/patch-ltmain_sh new file mode 100644 index 000000000..d33468526 --- /dev/null +++ b/package/libXt/patches/patch-ltmain_sh @@ -0,0 +1,11 @@ +--- libXt-1.0.7.orig/ltmain.sh 2009-09-11 16:54:52.000000000 +0200 ++++ libXt-1.0.7/ltmain.sh 2011-01-15 00:13:20.000000000 +0100 +@@ -1676,7 +1676,7 @@ EOF + # -F/path gives path to uninstalled frameworks, gcc on darwin + # @file GCC response files + -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) + + # Unknown arguments in both finalize_command and compile_command need + # to be aesthetically quoted because they are evaled later. diff --git a/package/libXv/patches/patch-ltmain_sh b/package/libXv/patches/patch-ltmain_sh new file mode 100644 index 000000000..bebaeec5b --- /dev/null +++ b/package/libXv/patches/patch-ltmain_sh @@ -0,0 +1,11 @@ +--- libXv-1.0.5.orig/ltmain.sh 2009-09-11 16:54:52.000000000 +0200 ++++ libXv-1.0.5/ltmain.sh 2011-01-15 22:32:11.000000000 +0100 +@@ -1676,7 +1676,7 @@ EOF + # -F/path gives path to uninstalled frameworks, gcc on darwin + # @file GCC response files + -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) + + # Unknown arguments in both finalize_command and compile_command need + # to be aesthetically quoted because they are evaled later. diff --git a/package/libao/patches/patch-ltmain_sh b/package/libao/patches/patch-ltmain_sh new file mode 100644 index 000000000..393127801 --- /dev/null +++ b/package/libao/patches/patch-ltmain_sh @@ -0,0 +1,11 @@ +--- libao-0.8.8.orig/ltmain.sh 2007-02-21 12:45:54.000000000 +0100 ++++ libao-0.8.8/ltmain.sh 2011-01-15 22:34:13.000000000 +0100 +@@ -1677,7 +1677,7 @@ EOF + # -F/path gives path to uninstalled frameworks, gcc on darwin + # @file GCC response files + -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) + + # Unknown arguments in both finalize_command and compile_command need + # to be aesthetically quoted because they are evaled later. diff --git a/package/libart/patches/100-cross_compile_fix.patch b/package/libart/patches/100-cross_compile_fix.patch index aae1acccf..90cfda45f 100644 --- a/package/libart/patches/100-cross_compile_fix.patch +++ b/package/libart/patches/100-cross_compile_fix.patch @@ -1,7 +1,7 @@ diff -urN libart.old/Makefile.in libart.dev/Makefile.in ---- libart.old/Makefile.in 2005-01-21 10:52:11.000000000 +0100 -+++ libart.dev/Makefile.in 2005-07-17 19:31:05.000000000 +0200 -@@ -440,9 +440,9 @@ +--- libart_lgpl-2.3.17.orig/Makefile.in 2005-01-21 10:52:11.000000000 +0100 ++++ libart_lgpl-2.3.17/Makefile.in 2011-01-15 22:35:19.000000000 +0100 +@@ -440,9 +440,9 @@ testuta$(EXEEXT): $(testuta_OBJECTS) $(t @rm -f testuta$(EXEEXT) $(LINK) $(testuta_LDFLAGS) $(testuta_OBJECTS) $(testuta_LDADD) $(LIBS) diff --git a/package/libart/patches/patch-ltmain_sh b/package/libart/patches/patch-ltmain_sh new file mode 100644 index 000000000..673d4f7ca --- /dev/null +++ b/package/libart/patches/patch-ltmain_sh @@ -0,0 +1,11 @@ +--- libart_lgpl-2.3.17.orig/ltmain.sh 2004-07-06 05:30:16.000000000 +0200 ++++ libart_lgpl-2.3.17/ltmain.sh 2011-01-15 22:36:41.000000000 +0100 +@@ -1385,7 +1385,7 @@ EOF + # but this is not reliable with gcc because gcc may use -mfoo to + # select a different linker, different libraries, etc, while + # -Wl,-mfoo simply passes -mfoo to the linker. +- -m*) ++ -m*|-fstack-protector*|-flto) + # Unknown arguments in both finalize_command and compile_command need + # to be aesthetically quoted because they are evaled later. + arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"` diff --git a/package/libaudiofile/Makefile b/package/libaudiofile/Makefile index 4b4f74d35..be4e93c61 100644 --- a/package/libaudiofile/Makefile +++ b/package/libaudiofile/Makefile @@ -3,14 +3,14 @@ include ${TOPDIR}/rules.mk -PKG_NAME:= libaudiofile -PKG_VERSION:= 0.2.6 -PKG_RELEASE:= 2 -PKG_MD5SUM:= 460f848ce5f4a33ae66b15a4fb7720ec +PKG_NAME:= audiofile +PKG_VERSION:= 0.2.7 +PKG_RELEASE:= 1 +PKG_MD5SUM:= a39be317a7b1971b408805dc5e371862 PKG_DESCR:= audiofile library PKG_SECTION:= libs -PKG_URL:= http://www.68k.org/~michael/audiofile -PKG_SITES:= http://www.openadk.org/distfiles/ +PKG_URL:= http://www.68k.org/~michael/audiofile/ +PKG_SITES:= http://www.68k.org/~michael/audiofile/ include ${TOPDIR}/mk/package.mk diff --git a/package/libaudiofile/patches/001-audiofile-config-libdirs.patch b/package/libaudiofile/patches/001-audiofile-config-libdirs.patch index ba92d7d4e..ef3ea3c0f 100644 --- a/package/libaudiofile/patches/001-audiofile-config-libdirs.patch +++ b/package/libaudiofile/patches/001-audiofile-config-libdirs.patch @@ -1,6 +1,6 @@ ---- libaudiofile-0.2.6/audiofile-config.in.orig 2004-03-06 07:39:23.000000000 +0100 -+++ libaudiofile-0.2.6/audiofile-config.in 2005-12-13 14:15:52.000000000 +0100 -@@ -45,7 +45,9 @@ +--- libaudiofile-0.2.6.orig/audiofile-config.in 2004-03-06 07:39:23.000000000 +0100 ++++ libaudiofile-0.2.6/audiofile-config.in 2011-01-14 22:38:44.000000000 +0100 +@@ -45,7 +45,9 @@ while test $# -gt 0; do echo $includes ;; --libs) diff --git a/package/libaudiofile/patches/patch-ltmain_sh b/package/libaudiofile/patches/patch-ltmain_sh new file mode 100644 index 000000000..499a548dd --- /dev/null +++ b/package/libaudiofile/patches/patch-ltmain_sh @@ -0,0 +1,27 @@ +--- audiofile-0.2.7.orig/ltmain.sh 2010-03-22 04:48:34.000000000 +0100 ++++ audiofile-0.2.7/ltmain.sh 2011-01-14 23:13:46.000000000 +0100 +@@ -1422,7 +1422,6 @@ EOF + esac + continue + ;; +- + -L*) + dir=`$echo "X$arg" | $Xsed -e 's/^-L//'` + # We need an absolute path. +@@ -1503,15 +1502,9 @@ EOF + # but this is not reliable with gcc because gcc may use -mfoo to + # select a different linker, different libraries, etc, while + # -Wl,-mfoo simply passes -mfoo to the linker. +- -m*) ++ -m*|-fstack-protector*|-flto) + # Unknown arguments in both finalize_command and compile_command need + # to be aesthetically quoted because they are evaled later. +- arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"` +- case $arg in +- *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") +- arg="\"$arg\"" +- ;; +- esac + compile_command="$compile_command $arg" + finalize_command="$finalize_command $arg" + if test "$with_gcc" = "yes" ; then diff --git a/package/libdaemon/patches/patch-ltmain_sh b/package/libdaemon/patches/patch-ltmain_sh new file mode 100644 index 000000000..40977292e --- /dev/null +++ b/package/libdaemon/patches/patch-ltmain_sh @@ -0,0 +1,11 @@ +--- libdaemon-0.13.orig/ltmain.sh 2008-06-09 21:51:04.000000000 +0200 ++++ libdaemon-0.13/ltmain.sh 2011-01-14 18:34:49.000000000 +0100 +@@ -1676,7 +1676,7 @@ EOF + # -F/path gives path to uninstalled frameworks, gcc on darwin + # @file GCC response files + -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) + + # Unknown arguments in both finalize_command and compile_command need + # to be aesthetically quoted because they are evaled later. diff --git a/package/libdb/patches/patch-dist_ltmain_sh b/package/libdb/patches/patch-dist_ltmain_sh new file mode 100644 index 000000000..e9ff24a13 --- /dev/null +++ b/package/libdb/patches/patch-dist_ltmain_sh @@ -0,0 +1,11 @@ +--- db-4.7.25.orig/dist/ltmain.sh 2006-06-27 03:03:33.000000000 +0200 ++++ db-4.7.25/dist/ltmain.sh 2011-01-14 19:32:22.000000000 +0100 +@@ -1623,7 +1623,7 @@ EOF + # -pg pass through profiling flag for GCC + # @file GCC response files + -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*|-pg| \ +- -t[45]*|-txscale*|@*) ++ -t[45]*|-txscale*|@*|-fstack-protector*|-flto) + + # Unknown arguments in both finalize_command and compile_command need + # to be aesthetically quoted because they are evaled later. diff --git a/package/libdnet/patches/libdnet-1.10-dnet_config.patch b/package/libdnet/patches/libdnet-1.10-dnet_config.patch index 005ac3305..82dda52ef 100644 --- a/package/libdnet/patches/libdnet-1.10-dnet_config.patch +++ b/package/libdnet/patches/libdnet-1.10-dnet_config.patch @@ -1,6 +1,6 @@ ---- libdnet-1.10/dnet-config.in.orig 2001-10-19 03:29:00.000000000 +0200 -+++ libdnet-1.10/dnet-config.in 2005-09-20 09:32:53.000000000 +0200 -@@ -45,10 +45,18 @@ +--- libdnet-1.10.orig/dnet-config.in 2001-10-19 03:29:00.000000000 +0200 ++++ libdnet-1.10/dnet-config.in 2011-01-14 11:44:00.000000000 +0100 +@@ -45,10 +45,18 @@ while test $# -gt 0; do done if test "$echo_cflags" = "yes"; then diff --git a/package/libdnet/patches/patch-config_ltmain_sh b/package/libdnet/patches/patch-config_ltmain_sh new file mode 100644 index 000000000..141618689 --- /dev/null +++ b/package/libdnet/patches/patch-config_ltmain_sh @@ -0,0 +1,11 @@ +--- libdnet-1.10.orig/config/ltmain.sh 2005-02-26 00:09:06.000000000 +0100 ++++ libdnet-1.10/config/ltmain.sh 2011-01-14 12:02:17.000000000 +0100 +@@ -1382,7 +1382,7 @@ EOF + # but this is not reliable with gcc because gcc may use -mfoo to + # select a different linker, different libraries, etc, while + # -Wl,-mfoo simply passes -mfoo to the linker. +- -m*) ++ -m*|-fstack-protector*|-flto) + # Unknown arguments in both finalize_command and compile_command need + # to be aesthetically quoted because they are evaled later. + arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"` diff --git a/package/libdrm/patches/patch-ltmain_sh b/package/libdrm/patches/patch-ltmain_sh new file mode 100644 index 000000000..ea1a793f9 --- /dev/null +++ b/package/libdrm/patches/patch-ltmain_sh @@ -0,0 +1,11 @@ +--- libdrm-2.4.22.orig/ltmain.sh 2010-01-21 11:04:52.000000000 +0100 ++++ libdrm-2.4.22/ltmain.sh 2011-01-14 01:13:30.000000000 +0100 +@@ -4765,7 +4765,7 @@ func_mode_link () + # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC + # @file GCC response files + -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) + func_quote_for_eval "$arg" + arg="$func_quote_for_eval_result" + func_append compile_command " $arg" 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/libelf/patches/patch-lib_Makefile_in b/package/libelf/patches/patch-lib_Makefile_in new file mode 100644 index 000000000..7630c7f5c --- /dev/null +++ b/package/libelf/patches/patch-lib_Makefile_in @@ -0,0 +1,11 @@ +--- libelf-0.8.13.orig/lib/Makefile.in 2009-11-01 14:04:19.000000000 +0100 ++++ libelf-0.8.13/lib/Makefile.in 2011-01-15 21:55:08.000000000 +0100 +@@ -158,7 +158,7 @@ libelf.a: $(OBJS) $(LIBOBJS) + + $(SHLIB): libelf.a + @$(RM) $(SHLIB) +- $(LINK_SHLIB) -o $(SHLIB) $(OBJS:.o=.os) $(LIBOBJS:.o=.os) $(DEPSHLIBS) ++ $(LINK_SHLIB) $(LDFLAGS) -o $(SHLIB) $(OBJS:.o=.os) $(LIBOBJS:.o=.os) $(DEPSHLIBS) + if test "$(SONAME)" = "$(SHLIB)"; then true; else \ + $(RM) $(SONAME) && $(LN_S) $(SHLIB) $(SONAME); \ + fi 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/libevent/patches/patch-ltmain_sh b/package/libevent/patches/patch-ltmain_sh new file mode 100644 index 000000000..b2a564fa8 --- /dev/null +++ b/package/libevent/patches/patch-ltmain_sh @@ -0,0 +1,11 @@ +--- libevent-1.3.orig/ltmain.sh 2006-12-09 05:42:31.000000000 +0100 ++++ libevent-1.3/ltmain.sh 2011-01-14 12:04:21.000000000 +0100 +@@ -1623,7 +1623,7 @@ EOF + # -pg pass through profiling flag for GCC + # @file GCC response files + -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*|-pg| \ +- -t[45]*|-txscale*|@*) ++ -t[45]*|-txscale*|@*|-fstack-protector*|-flto) + + # Unknown arguments in both finalize_command and compile_command need + # to be aesthetically quoted because they are evaled later. diff --git a/package/libffi/patches/patch-ltmain_sh b/package/libffi/patches/patch-ltmain_sh new file mode 100644 index 000000000..02c12cbfb --- /dev/null +++ b/package/libffi/patches/patch-ltmain_sh @@ -0,0 +1,11 @@ +--- libffi-3.0.9.orig/ltmain.sh 2009-12-31 13:38:48.000000000 +0100 ++++ libffi-3.0.9/ltmain.sh 2011-01-14 19:48:53.000000000 +0100 +@@ -4765,7 +4765,7 @@ func_mode_link () + # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC + # @file GCC response files + -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) + func_quote_for_eval "$arg" + arg="$func_quote_for_eval_result" + func_append compile_command " $arg" diff --git a/package/libfontenc/patches/patch-ltmain_sh b/package/libfontenc/patches/patch-ltmain_sh new file mode 100644 index 000000000..7c092bb10 --- /dev/null +++ b/package/libfontenc/patches/patch-ltmain_sh @@ -0,0 +1,11 @@ +--- libfontenc-1.0.5.orig/ltmain.sh 2009-05-18 04:27:25.000000000 +0200 ++++ libfontenc-1.0.5/ltmain.sh 2011-01-15 22:24:34.000000000 +0100 +@@ -4765,7 +4765,7 @@ func_mode_link () + # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC + # @file GCC response files + -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) + func_quote_for_eval "$arg" + arg="$func_quote_for_eval_result" + func_append compile_command " $arg" diff --git a/package/libgcrypt/patches/patch-ltmain_sh b/package/libgcrypt/patches/patch-ltmain_sh new file mode 100644 index 000000000..b9caca043 --- /dev/null +++ b/package/libgcrypt/patches/patch-ltmain_sh @@ -0,0 +1,11 @@ +--- libgcrypt-1.4.5.orig/ltmain.sh 2009-04-02 11:25:35.000000000 +0200 ++++ libgcrypt-1.4.5/ltmain.sh 2011-01-14 20:42:36.000000000 +0100 +@@ -1623,7 +1623,7 @@ EOF + # -pg pass through profiling flag for GCC + # @file GCC response files + -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*|-pg| \ +- -t[45]*|-txscale*|@*) ++ -t[45]*|-txscale*|@*|-fstack-protector*|-flto) + + # Unknown arguments in both finalize_command and compile_command need + # to be aesthetically quoted because they are evaled later. diff --git a/package/libgssglue/patches/patch-ltmain_sh b/package/libgssglue/patches/patch-ltmain_sh new file mode 100644 index 000000000..12459df44 --- /dev/null +++ b/package/libgssglue/patches/patch-ltmain_sh @@ -0,0 +1,11 @@ +--- libgssglue-0.1.orig/ltmain.sh 2005-12-02 22:14:34.000000000 +0100 ++++ libgssglue-0.1/ltmain.sh 2011-01-15 22:40:39.000000000 +0100 +@@ -1382,7 +1382,7 @@ EOF + # but this is not reliable with gcc because gcc may use -mfoo to + # select a different linker, different libraries, etc, while + # -Wl,-mfoo simply passes -mfoo to the linker. +- -m*) ++ -m*|-fstack-protector*|-flto) + # Unknown arguments in both finalize_command and compile_command need + # to be aesthetically quoted because they are evaled later. + arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"` diff --git a/package/libiconv/patches/patch-build-aux_ltmain_sh b/package/libiconv/patches/patch-build-aux_ltmain_sh new file mode 100644 index 000000000..1c6d67d61 --- /dev/null +++ b/package/libiconv/patches/patch-build-aux_ltmain_sh @@ -0,0 +1,11 @@ +--- libiconv-1.13.1.orig/build-aux/ltmain.sh 2009-06-21 13:17:33.000000000 +0200 ++++ libiconv-1.13.1/build-aux/ltmain.sh 2011-01-14 00:42:49.000000000 +0100 +@@ -4885,7 +4885,7 @@ func_mode_link () + # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC + # @file GCC response files + -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) + func_quote_for_eval "$arg" + arg="$func_quote_for_eval_result" + func_append compile_command " $arg" diff --git a/package/libiconv/patches/patch-libcharset_build-aux_ltmain_sh b/package/libiconv/patches/patch-libcharset_build-aux_ltmain_sh new file mode 100644 index 000000000..1c0c92ab1 --- /dev/null +++ b/package/libiconv/patches/patch-libcharset_build-aux_ltmain_sh @@ -0,0 +1,11 @@ +--- libiconv-1.13.1.orig/libcharset/build-aux/ltmain.sh 2009-06-21 13:17:33.000000000 +0200 ++++ libiconv-1.13.1/libcharset/build-aux/ltmain.sh 2011-01-14 00:44:22.000000000 +0100 +@@ -4885,7 +4885,7 @@ func_mode_link () + # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC + # @file GCC response files + -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) + func_quote_for_eval "$arg" + arg="$func_quote_for_eval_result" + func_append compile_command " $arg" diff --git a/package/liblzo/patches/patch-autoconf_ltmain_sh b/package/liblzo/patches/patch-autoconf_ltmain_sh new file mode 100644 index 000000000..9984105f8 --- /dev/null +++ b/package/liblzo/patches/patch-autoconf_ltmain_sh @@ -0,0 +1,11 @@ +--- lzo-2.03.orig/autoconf/ltmain.sh 2008-04-30 14:51:49.000000000 +0200 ++++ lzo-2.03/autoconf/ltmain.sh 2011-01-15 19:26:34.000000000 +0100 +@@ -1623,7 +1623,7 @@ EOF + # -pg pass through profiling flag for GCC + # @file GCC response files + -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*|-pg| \ +- -t[45]*|-txscale*|@*) ++ -t[45]*|-txscale*|@*|-fstack-protector*|-flto) + + # Unknown arguments in both finalize_command and compile_command need + # to be aesthetically quoted because they are evaled later. 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/libmad/patches/patch-ltmain_sh b/package/libmad/patches/patch-ltmain_sh new file mode 100644 index 000000000..7dc9efb7d --- /dev/null +++ b/package/libmad/patches/patch-ltmain_sh @@ -0,0 +1,11 @@ +--- libmad-0.15.1b.orig/ltmain.sh 2004-02-17 02:51:24.000000000 +0100 ++++ libmad-0.15.1b/ltmain.sh 2011-01-15 22:43:18.000000000 +0100 +@@ -1372,7 +1372,7 @@ EOF + # but this is not reliable with gcc because gcc may use -mfoo to + # select a different linker, different libraries, etc, while + # -Wl,-mfoo simply passes -mfoo to the linker. +- -m*) ++ -m*|-fstack-protector*|-flto) + # Unknown arguments in both finalize_command and compile_command need + # to be aesthetically quoted because they are evaled later. + arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"` diff --git a/package/libmms/patches/patch-ltmain_sh b/package/libmms/patches/patch-ltmain_sh new file mode 100644 index 000000000..709251ce3 --- /dev/null +++ b/package/libmms/patches/patch-ltmain_sh @@ -0,0 +1,11 @@ +--- libmms-0.5.orig/ltmain.sh 2009-11-03 10:26:05.000000000 +0100 ++++ libmms-0.5/ltmain.sh 2011-01-15 22:44:48.000000000 +0100 +@@ -4765,7 +4765,7 @@ func_mode_link () + # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC + # @file GCC response files + -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) + func_quote_for_eval "$arg" + arg="$func_quote_for_eval_result" + func_append compile_command " $arg" diff --git a/package/libmpdclient/patches/patch-build_ltmain_sh b/package/libmpdclient/patches/patch-build_ltmain_sh new file mode 100644 index 000000000..5f8c6273c --- /dev/null +++ b/package/libmpdclient/patches/patch-build_ltmain_sh @@ -0,0 +1,11 @@ +--- libmpdclient-2.2.orig/build/ltmain.sh 2009-12-09 22:05:28.000000000 +0100 ++++ libmpdclient-2.2/build/ltmain.sh 2011-01-15 22:46:18.000000000 +0100 +@@ -4765,7 +4765,7 @@ func_mode_link () + # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC + # @file GCC response files + -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) + func_quote_for_eval "$arg" + arg="$func_quote_for_eval_result" + func_append compile_command " $arg" diff --git a/package/libnet/patches/patch-ltmain_sh b/package/libnet/patches/patch-ltmain_sh new file mode 100644 index 000000000..cc5affa12 --- /dev/null +++ b/package/libnet/patches/patch-ltmain_sh @@ -0,0 +1,11 @@ +--- libnet-1.1.5.orig/ltmain.sh 2007-08-14 20:05:31.000000000 +0200 ++++ libnet-1.1.5/ltmain.sh 2011-01-14 22:19:20.000000000 +0100 +@@ -1663,7 +1663,7 @@ EOF + # -F/path gives path to uninstalled frameworks, gcc on darwin + # @file GCC response files + -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) + + # Unknown arguments in both finalize_command and compile_command need + # to be aesthetically quoted because they are evaled later. diff --git a/package/libnetfilter_conntrack/patches/patch-ltmain_sh b/package/libnetfilter_conntrack/patches/patch-ltmain_sh new file mode 100644 index 000000000..b29e65024 --- /dev/null +++ b/package/libnetfilter_conntrack/patches/patch-ltmain_sh @@ -0,0 +1,11 @@ +--- libnetfilter_conntrack-0.0.101.orig/ltmain.sh 2009-04-08 00:25:23.000000000 +0200 ++++ libnetfilter_conntrack-0.0.101/ltmain.sh 2011-01-14 20:35:18.000000000 +0100 +@@ -4765,7 +4765,7 @@ func_mode_link () + # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC + # @file GCC response files + -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) + func_quote_for_eval "$arg" + arg="$func_quote_for_eval_result" + func_append compile_command " $arg" diff --git a/package/libnetfilter_log/patches/patch-ltmain_sh b/package/libnetfilter_log/patches/patch-ltmain_sh new file mode 100644 index 000000000..e20823d60 --- /dev/null +++ b/package/libnetfilter_log/patches/patch-ltmain_sh @@ -0,0 +1,11 @@ +--- libnetfilter_log-1.0.0.orig/ltmain.sh 2009-12-10 00:55:19.000000000 +0100 ++++ libnetfilter_log-1.0.0/ltmain.sh 2011-01-15 22:47:50.000000000 +0100 +@@ -4765,7 +4765,7 @@ func_mode_link () + # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC + # @file GCC response files + -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) + func_quote_for_eval "$arg" + arg="$func_quote_for_eval_result" + func_append compile_command " $arg" diff --git a/package/libnetfilter_queue/patches/patch-ltmain_sh b/package/libnetfilter_queue/patches/patch-ltmain_sh new file mode 100644 index 000000000..98484bd51 --- /dev/null +++ b/package/libnetfilter_queue/patches/patch-ltmain_sh @@ -0,0 +1,11 @@ +--- libnetfilter_queue-0.0.17.orig/ltmain.sh 2008-04-29 23:33:55.000000000 +0200 ++++ libnetfilter_queue-0.0.17/ltmain.sh 2011-01-15 22:49:28.000000000 +0100 +@@ -1676,7 +1676,7 @@ EOF + # -F/path gives path to uninstalled frameworks, gcc on darwin + # @file GCC response files + -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) + + # Unknown arguments in both finalize_command and compile_command need + # to be aesthetically quoted because they are evaled later. diff --git a/package/libnfnetlink/patches/patch-ltmain_sh b/package/libnfnetlink/patches/patch-ltmain_sh new file mode 100644 index 000000000..66d4e2d92 --- /dev/null +++ b/package/libnfnetlink/patches/patch-ltmain_sh @@ -0,0 +1,11 @@ +--- libnfnetlink-1.0.0.orig/ltmain.sh 2008-04-29 23:33:55.000000000 +0200 ++++ libnfnetlink-1.0.0/ltmain.sh 2011-01-14 20:31:43.000000000 +0100 +@@ -1676,7 +1676,7 @@ EOF + # -F/path gives path to uninstalled frameworks, gcc on darwin + # @file GCC response files + -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) + + # Unknown arguments in both finalize_command and compile_command need + # to be aesthetically quoted because they are evaled later. diff --git a/package/libnfsidmap/patches/patch-ltmain_sh b/package/libnfsidmap/patches/patch-ltmain_sh new file mode 100644 index 000000000..75caf5e29 --- /dev/null +++ b/package/libnfsidmap/patches/patch-ltmain_sh @@ -0,0 +1,11 @@ +--- libnfsidmap-0.21b1.orig/ltmain.sh 2004-08-09 17:06:29.000000000 +0200 ++++ libnfsidmap-0.21b1/ltmain.sh 2011-01-15 22:51:07.000000000 +0100 +@@ -1382,7 +1382,7 @@ EOF + # but this is not reliable with gcc because gcc may use -mfoo to + # select a different linker, different libraries, etc, while + # -Wl,-mfoo simply passes -mfoo to the linker. +- -m*) ++ -m*|-fstack-protector*|-flto) + # Unknown arguments in both finalize_command and compile_command need + # to be aesthetically quoted because they are evaled later. + arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"` diff --git a/package/libnl/Makefile b/package/libnl/Makefile index d7021a844..c2878f406 100644 --- a/package/libnl/Makefile +++ b/package/libnl/Makefile @@ -4,12 +4,14 @@ include ${TOPDIR}/rules.mk PKG_NAME:= libnl -PKG_VERSION:= 1.1 -PKG_RELEASE:= 1 -PKG_MD5SUM:= ae970ccd9144e132b68664f98e7ceeb1 +PKG_VERSION:= 2.0 +PKG_RELEASE:= 2 +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_NOPARALLEL:= 1 PKG_SUBPKGS:= LIBNL LIBNL_DEV PKGSD_LIBNL_DEV:= header files for netlink library @@ -17,16 +19,15 @@ 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 + ${CP} ${WRKINST}/usr/lib/libnl-genl.so* ${IDIR_LIBNL}/usr/lib + ${CP} ${WRKINST}/usr/lib/libnl-cli.so* ${IDIR_LIBNL}/usr/lib + ${CP} ${WRKINST}/usr/lib/libnl-route.so* ${IDIR_LIBNL}/usr/lib libnl-dev-install: ${INSTALL_DIR} ${IDIR_LIBNL_DEV}/usr/include 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-ltmain_sh b/package/libnl/patches/patch-ltmain_sh new file mode 100644 index 000000000..2058e0c78 --- /dev/null +++ b/package/libnl/patches/patch-ltmain_sh @@ -0,0 +1,11 @@ +--- libnl-2.0.orig/ltmain.sh 2010-10-13 16:43:44.000000000 +0200 ++++ libnl-2.0/ltmain.sh 2011-01-15 21:22:48.000000000 +0100 +@@ -4765,7 +4765,7 @@ func_mode_link () + # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC + # @file GCC response files + -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) + func_quote_for_eval "$arg" + arg="$func_quote_for_eval_result" + func_append compile_command " $arg" 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/libol/patches/patch-ltmain_sh b/package/libol/patches/patch-ltmain_sh new file mode 100644 index 000000000..c5f9a8f81 --- /dev/null +++ b/package/libol/patches/patch-ltmain_sh @@ -0,0 +1,11 @@ +--- libol-0.3.18.orig/ltmain.sh 2005-04-01 02:47:06.000000000 +0200 ++++ libol-0.3.18/ltmain.sh 2011-01-15 22:53:34.000000000 +0100 +@@ -1382,7 +1382,7 @@ EOF + # but this is not reliable with gcc because gcc may use -mfoo to + # select a different linker, different libraries, etc, while + # -Wl,-mfoo simply passes -mfoo to the linker. +- -m*) ++ -m*|-fstack-protector*|-flto) + # Unknown arguments in both finalize_command and compile_command need + # to be aesthetically quoted because they are evaled later. + arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"` diff --git a/package/libosip2/patches/patch-scripts_ltmain_sh b/package/libosip2/patches/patch-scripts_ltmain_sh new file mode 100644 index 000000000..e354b4086 --- /dev/null +++ b/package/libosip2/patches/patch-scripts_ltmain_sh @@ -0,0 +1,11 @@ +--- libosip2-3.3.0.orig/scripts/ltmain.sh 2008-04-29 22:21:21.000000000 +0200 ++++ libosip2-3.3.0/scripts/ltmain.sh 2011-01-15 22:56:16.000000000 +0100 +@@ -1676,7 +1676,7 @@ EOF + # -F/path gives path to uninstalled frameworks, gcc on darwin + # @file GCC response files + -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) + + # Unknown arguments in both finalize_command and compile_command need + # to be aesthetically quoted because they are evaled later. diff --git a/package/libowfat/Makefile b/package/libowfat/Makefile index c6e21ae01..d1b6150b5 100644 --- a/package/libowfat/Makefile +++ b/package/libowfat/Makefile @@ -19,7 +19,8 @@ CONFIG_STYLE:= manual TCFLAGS+= ${TCPPFLAGS} MAKE_FILE= GNUmakefile -MAKE_FLAGS+= DIET= CC='${TARGET_CC}' CROSS=${TARGET_CROSS} +MAKE_FLAGS+= DIET= CC='${TARGET_CC}' CROSS=${TARGET_CROSS} \ + LDFLAGS='${TARGET_LDFLAGS}' FAKE_FLAGS+= prefix='${WRKINST}/usr' \ INCLUDEDIR='${WRKINST}/usr/include/owfat' diff --git a/package/libowfat/patches/patch-GNUmakefile b/package/libowfat/patches/patch-GNUmakefile index 24c836bac..553338e2f 100644 --- a/package/libowfat/patches/patch-GNUmakefile +++ b/package/libowfat/patches/patch-GNUmakefile @@ -1,6 +1,6 @@ $Id$ ---- libowfat-0.25.orig/GNUmakefile 2006-07-16 01:17:01.000000000 +0200 -+++ libowfat-0.25/GNUmakefile 2007-07-06 17:35:01.000000000 +0200 +--- libowfat-0.28.orig/GNUmakefile 2006-07-16 01:17:01.000000000 +0200 ++++ libowfat-0.28/GNUmakefile 2011-01-15 13:58:17.000000000 +0100 @@ -18,7 +18,7 @@ all: t $(LIBS) libowfat.a libsocket CROSS= #CROSS=i686-mingw- @@ -10,3 +10,21 @@ $Id$ #CFLAGS=-pipe -Os -march=pentiumpro -mcpu=pentiumpro -fomit-frame-pointer -fschedule-insns2 -Wall # CFLAGS += -fstrict-aliasing -Wstrict-aliasing=2 +@@ -27,7 +27,7 @@ CFLAGS += -D_REENTRANT + + # startrip + ifneq ($(DEBUG),) +-CFLAGS=-pipe -Wall -g ++CFLAGS=-g -Wall + endif + path = $(subst :, ,$(PATH)) + diet_path = $(foreach dir,$(path),$(wildcard $(dir)/diet)) +@@ -147,7 +147,7 @@ CFLAGS+=-I. + t.o: iopause.h + + t: t.o libowfat.a libsocket +- $(DIET) $(CC) -g -o $@ t.o libowfat.a `cat libsocket` ++ $(DIET) $(CC) $(LDFLAGS) -o $@ t.o libowfat.a `cat libsocket` + + .PHONY: all clean tar install rename + clean: diff --git a/package/libowfat/patches/patch-Makefile b/package/libowfat/patches/patch-Makefile new file mode 100644 index 000000000..226d77837 --- /dev/null +++ b/package/libowfat/patches/patch-Makefile @@ -0,0 +1,11 @@ +--- libowfat-0.28.orig/Makefile 2008-11-15 17:06:28.000000000 +0100 ++++ libowfat-0.28/Makefile 2011-01-15 13:40:31.000000000 +0100 +@@ -603,7 +603,7 @@ CFLAGS+=-I. + t.o: iopause.h + + t: t.o libowfat.a libsocket +- $(DIET) $(CC) -g -o $@ t.o libowfat.a `cat libsocket` ++ $(DIET) $(CC) $(LDFLAGS) -g -o $@ t.o libowfat.a `cat libsocket` + + .PHONY: all clean tar install rename + clean: 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/libp11/patches/patch-ltmain_sh b/package/libp11/patches/patch-ltmain_sh new file mode 100644 index 000000000..409b69508 --- /dev/null +++ b/package/libp11/patches/patch-ltmain_sh @@ -0,0 +1,11 @@ +--- libp11-0.2.7.orig/ltmain.sh 2009-10-20 14:38:20.000000000 +0200 ++++ libp11-0.2.7/ltmain.sh 2011-01-15 22:58:43.000000000 +0100 +@@ -4765,7 +4765,7 @@ func_mode_link () + # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC + # @file GCC response files + -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) + func_quote_for_eval "$arg" + arg="$func_quote_for_eval_result" + func_append compile_command " $arg" diff --git a/package/libpcap/Makefile b/package/libpcap/Makefile index ebc7701ce..209a337df 100644 --- a/package/libpcap/Makefile +++ b/package/libpcap/Makefile @@ -5,14 +5,14 @@ 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 PKG_URL:= http://www.tcpdump.org/ PKG_SITES:= http://www.tcpdump.org/release/ -PKG_FLAVOURS:= WITH_IPV6 +PKG_FLAVOURS_LIBPCAP:= WITH_IPV6 PKGFD_WITH_IPV6:= enable IPv6 support include $(TOPDIR)/mk/package.mk 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/libpciaccess/patches/patch-ltmain_sh b/package/libpciaccess/patches/patch-ltmain_sh new file mode 100644 index 000000000..178b522ce --- /dev/null +++ b/package/libpciaccess/patches/patch-ltmain_sh @@ -0,0 +1,11 @@ +--- libpciaccess-0.11.0.orig/ltmain.sh 2009-11-17 23:55:38.000000000 +0100 ++++ libpciaccess-0.11.0/ltmain.sh 2011-01-15 23:00:07.000000000 +0100 +@@ -4765,7 +4765,7 @@ func_mode_link () + # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC + # @file GCC response files + -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) + func_quote_for_eval "$arg" + arg="$func_quote_for_eval_result" + func_append compile_command " $arg" 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/libpng/patches/patch-ltmain_sh b/package/libpng/patches/patch-ltmain_sh new file mode 100644 index 000000000..3dc47967e --- /dev/null +++ b/package/libpng/patches/patch-ltmain_sh @@ -0,0 +1,11 @@ +--- libpng-1.2.44.orig/ltmain.sh 2009-11-22 15:45:24.000000000 +0100 ++++ libpng-1.2.44/ltmain.sh 2011-01-14 00:13:24.000000000 +0100 +@@ -4765,7 +4765,7 @@ func_mode_link () + # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC + # @file GCC response files + -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) + func_quote_for_eval "$arg" + arg="$func_quote_for_eval_result" + func_append compile_command " $arg" diff --git a/package/librpcsecgss/patches/patch-ltmain_sh b/package/librpcsecgss/patches/patch-ltmain_sh new file mode 100644 index 000000000..7c498e575 --- /dev/null +++ b/package/librpcsecgss/patches/patch-ltmain_sh @@ -0,0 +1,11 @@ +--- librpcsecgss-0.19.orig/ltmain.sh 2009-05-13 23:33:08.000000000 +0200 ++++ librpcsecgss-0.19/ltmain.sh 2011-01-15 23:01:58.000000000 +0100 +@@ -1382,7 +1382,7 @@ EOF + # but this is not reliable with gcc because gcc may use -mfoo to + # select a different linker, different libraries, etc, while + # -Wl,-mfoo simply passes -mfoo to the linker. +- -m*) ++ -m*|-fstack-protector*|-flto) + # Unknown arguments in both finalize_command and compile_command need + # to be aesthetically quoted because they are evaled later. + arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"` diff --git a/package/libshout/patches/patch-ltmain_sh b/package/libshout/patches/patch-ltmain_sh new file mode 100644 index 000000000..16c4c7888 --- /dev/null +++ b/package/libshout/patches/patch-ltmain_sh @@ -0,0 +1,11 @@ +--- libshout-2.2.2.orig/ltmain.sh 2006-01-10 16:23:50.000000000 +0100 ++++ libshout-2.2.2/ltmain.sh 2011-01-15 23:03:59.000000000 +0100 +@@ -1623,7 +1623,7 @@ EOF + # -pg pass through profiling flag for GCC + # @file GCC response files + -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*|-pg| \ +- -t[45]*|-txscale*|@*) ++ -t[45]*|-txscale*|@*|-fstack-protector*|-flto) + + # Unknown arguments in both finalize_command and compile_command need + # to be aesthetically quoted because they are evaled later. diff --git a/package/libstdcxx/Makefile b/package/libstdcxx/Makefile index eb935fbb8..efdb3ba72 100644 --- a/package/libstdcxx/Makefile +++ b/package/libstdcxx/Makefile @@ -27,11 +27,11 @@ BUILD_STYLE:= manual INSTALL_STYLE:= manual do-install: - ${INSTALL_DIR} ${IDIR_LIBSTDCXX}/lib + ${INSTALL_DIR} ${IDIR_LIBSTDCXX}/usr/lib ifeq ($(ADK_NATIVE),y) - $(CP) /usr/lib/libstdc++.so.* ${IDIR_LIBSTDCXX}/lib + $(CP) /usr/lib/libstdc++.so* ${IDIR_LIBSTDCXX}/usr/lib else - $(CP) ${STAGING_TARGET_DIR}/lib/libstdc++.so.* ${IDIR_LIBSTDCXX}/lib + $(CP) ${STAGING_TARGET_DIR}/lib/libstdc++.so* ${IDIR_LIBSTDCXX}/usr/lib endif include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/libtasn1/patches/patch-build-aux_ltmain_sh b/package/libtasn1/patches/patch-build-aux_ltmain_sh new file mode 100644 index 000000000..c48047c43 --- /dev/null +++ b/package/libtasn1/patches/patch-build-aux_ltmain_sh @@ -0,0 +1,11 @@ +--- libtasn1-2.2.orig/build-aux/ltmain.sh 2009-05-20 12:03:37.000000000 +0200 ++++ libtasn1-2.2/build-aux/ltmain.sh 2011-01-15 19:29:40.000000000 +0100 +@@ -4765,7 +4765,7 @@ func_mode_link () + # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC + # @file GCC response files + -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) + func_quote_for_eval "$arg" + arg="$func_quote_for_eval_result" + func_append compile_command " $arg" 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/libtiff/patches/patch-config_ltmain_sh b/package/libtiff/patches/patch-config_ltmain_sh new file mode 100644 index 000000000..9ac507120 --- /dev/null +++ b/package/libtiff/patches/patch-config_ltmain_sh @@ -0,0 +1,11 @@ +--- tiff-3.9.4.orig/config/ltmain.sh 2010-06-11 22:28:18.000000000 +0200 ++++ tiff-3.9.4/config/ltmain.sh 2011-01-14 00:30:36.000000000 +0100 +@@ -5091,7 +5091,7 @@ func_mode_link () + # @file GCC response files + # -tp=* Portland pgcc target processor selection + -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \ +- -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*) ++ -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|-fstack-protector*|-flto) + func_quote_for_eval "$arg" + arg="$func_quote_for_eval_result" + func_append compile_command " $arg" diff --git a/package/libtirpc/patches/patch-ltmain_sh b/package/libtirpc/patches/patch-ltmain_sh new file mode 100644 index 000000000..599235216 --- /dev/null +++ b/package/libtirpc/patches/patch-ltmain_sh @@ -0,0 +1,11 @@ +--- libtirpc-0.2.1.orig/ltmain.sh 2009-11-30 15:10:18.000000000 +0100 ++++ libtirpc-0.2.1/ltmain.sh 2011-01-15 23:09:39.000000000 +0100 +@@ -4765,7 +4765,7 @@ func_mode_link () + # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC + # @file GCC response files + -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) + func_quote_for_eval "$arg" + arg="$func_quote_for_eval_result" + func_append compile_command " $arg" 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/libtool/patches/patch-libltdl_config_ltmain_sh b/package/libtool/patches/patch-libltdl_config_ltmain_sh new file mode 100644 index 000000000..bc46ecca5 --- /dev/null +++ b/package/libtool/patches/patch-libltdl_config_ltmain_sh @@ -0,0 +1,31 @@ +--- libtool-2.4.orig/libltdl/config/ltmain.sh 2010-09-22 16:45:43.000000000 +0200 ++++ libtool-2.4/libltdl/config/ltmain.sh 2011-01-15 12:03:36.000000000 +0100 +@@ -136,15 +136,15 @@ progpath="$0" + + : ${CP="cp -f"} + test "${ECHO+set}" = set || ECHO=${as_echo-'printf %s\n'} +-: ${EGREP="grep -E"} +-: ${FGREP="grep -F"} +-: ${GREP="grep"} ++: ${EGREP="/usr/bin/grep -E"} ++: ${FGREP="/usr/bin/grep -F"} ++: ${GREP="/usr/bin/grep"} + : ${LN_S="ln -s"} + : ${MAKE="make"} + : ${MKDIR="mkdir"} + : ${MV="mv -f"} + : ${RM="rm -f"} +-: ${SED="sed"} ++: ${SED="/Volumes/adk/openadk/scripts/sed"} + : ${SHELL="${CONFIG_SHELL-/bin/sh}"} + : ${Xsed="$SED -e 1s/^X//"} + +@@ -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*|@*|-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/package/libupnp/patches/autotool.patch b/package/libupnp/patches/autotool.patch index dd3e01157..72a57a5a1 100644 --- a/package/libupnp/patches/autotool.patch +++ b/package/libupnp/patches/autotool.patch @@ -16232,7 +16232,7 @@ diff -Nur libupnp-1.6.6.orig/build-aux/ltmain.sh libupnp-1.6.6/build-aux/ltmain. + # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC + # @file GCC response files + -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) + func_quote_for_eval "$arg" + arg="$func_quote_for_eval_result" + func_append compile_command " $arg" 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/libusb/patches/patch-ltmain_sh b/package/libusb/patches/patch-ltmain_sh new file mode 100644 index 000000000..7ac5092b0 --- /dev/null +++ b/package/libusb/patches/patch-ltmain_sh @@ -0,0 +1,11 @@ +--- libusb-1.0.8.orig/ltmain.sh 2010-05-05 00:02:07.000000000 +0200 ++++ libusb-1.0.8/ltmain.sh 2011-01-14 19:20:50.000000000 +0100 +@@ -4765,7 +4765,7 @@ func_mode_link () + # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC + # @file GCC response files + -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) + func_quote_for_eval "$arg" + arg="$func_quote_for_eval_result" + func_append compile_command " $arg" diff --git a/package/libvirt/Makefile b/package/libvirt/Makefile index 0db8d6993..03ff483f2 100644 --- a/package/libvirt/Makefile +++ b/package/libvirt/Makefile @@ -4,9 +4,9 @@ include ${TOPDIR}/rules.mk PKG_NAME:= libvirt -PKG_VERSION:= 0.8.6 +PKG_VERSION:= 0.8.7 PKG_RELEASE:= 1 -PKG_MD5SUM:= 9ed61a02983dc42d0ea0224711ace025 +PKG_MD5SUM:= 596bafb53bb6c079a0703f1726cb2305 PKG_DESCR:= virtualization API PKG_SECTION:= libs PKG_DEPENDS:= libxml2 libgnutls python2 libpcap @@ -28,6 +28,7 @@ CONFIGURE_ARGS+= --without-xen \ --without-openvz \ --without-lxc \ --without-vbox \ + --without-macvtap \ --disable-silent-rules \ --without-sasl diff --git a/package/libvirt/patches/patch-build-aux_ltmain_sh b/package/libvirt/patches/patch-build-aux_ltmain_sh new file mode 100644 index 000000000..356d4e661 --- /dev/null +++ b/package/libvirt/patches/patch-build-aux_ltmain_sh @@ -0,0 +1,11 @@ +--- libvirt-0.8.7.orig/build-aux/ltmain.sh 2011-01-04 03:22:29.000000000 +0100 ++++ libvirt-0.8.7/build-aux/ltmain.sh 2011-01-15 23:16:47.000000000 +0100 +@@ -5091,7 +5091,7 @@ func_mode_link () + # @file GCC response files + # -tp=* Portland pgcc target processor selection + -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \ +- -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*) ++ -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|-fstack-protector*|-flto) + func_quote_for_eval "$arg" + arg="$func_quote_for_eval_result" + func_append compile_command " $arg" diff --git a/package/libvirt/patches/patch-configure b/package/libvirt/patches/patch-configure new file mode 100644 index 000000000..87eb324fc --- /dev/null +++ b/package/libvirt/patches/patch-configure @@ -0,0 +1,38 @@ +--- libvirt-0.8.7.orig/configure 2011-01-04 03:22:44.000000000 +0100 ++++ libvirt-0.8.7/configure 2011-01-12 18:43:03.000000000 +0100 +@@ -36745,7 +36745,7 @@ $as_echo "$as_me: Found python in enviro + + # Find any Python interpreter. + if test -z "$PYTHON"; then +- for ac_prog in python python2 python3 python3.0 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 ++ for ac_prog in python python2 python3 python3.0 python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 + do + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 +@@ -36920,25 +36920,7 @@ $as_echo "$am_cv_python_pyexecdir" >&6; + if test -x "$PYTHON_CONFIG" + then + PYTHON_INCLUDES=`$PYTHON_CONFIG --includes` +- else +- if test -r $PYTHON_EXEC_PREFIX/include/python$PYTHON_VERSION/Python.h +- then +- PYTHON_INCLUDES=-I$PYTHON_EXEC_PREFIX/include/python$PYTHON_VERSION +- else +- if test -r $prefix/include/python$PYTHON_VERSION/Python.h +- then +- PYTHON_INCLUDES=-I$prefix/include/python$PYTHON_VERSION +- else +- if test -r /usr/include/python$PYTHON_VERSION/Python.h +- then +- PYTHON_INCLUDES=-I/usr/include/python$PYTHON_VERSION +- else +- { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find python$PYTHON_VERSION/Python.h, disabling bindings" >&5 +-$as_echo "$as_me: Could not find python$PYTHON_VERSION/Python.h, disabling bindings" >&6;} +- with_python=no +- fi +- fi +- fi ++ echo "DEBUG: $PYTHON_CONFIG" + fi + else + { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find python interpreter, disabling bindings" >&5 diff --git a/package/libvirt/patches/patch-libvirt_pc b/package/libvirt/patches/patch-libvirt_pc new file mode 100644 index 000000000..a46fcce14 --- /dev/null +++ b/package/libvirt/patches/patch-libvirt_pc @@ -0,0 +1,9 @@ +--- libvirt-0.8.7.orig/libvirt.pc 2011-01-04 03:23:23.000000000 +0100 ++++ libvirt-0.8.7/libvirt.pc 2011-01-12 18:31:53.000000000 +0100 +@@ -7,5 +7,5 @@ Name: libvirt + Version: 0.8.7 + Description: libvirt library + Requires: +-Libs: -L${libdir} -lvirt -ldl ++Libs: -L${libdir} -lvirt -lintl + Cflags: -I${includedir} diff --git a/package/libvirt/patches/patch-src_storage_storage_backend_c b/package/libvirt/patches/patch-src_storage_storage_backend_c index bab29e4bb..7a1713e7b 100644 --- a/package/libvirt/patches/patch-src_storage_storage_backend_c +++ b/package/libvirt/patches/patch-src_storage_storage_backend_c @@ -1,6 +1,6 @@ ---- libvirt-0.7.4.orig/src/storage/storage_backend.c 2009-11-10 14:32:15.000000000 +0100 -+++ libvirt-0.7.4/src/storage/storage_backend.c 2009-11-23 22:51:40.000000000 +0100 -@@ -136,7 +136,7 @@ virStorageBackendCopyToFD(virConnectPtr +--- libvirt-0.8.7.orig/src/storage/storage_backend.c 2010-12-22 09:54:05.000000000 +0100 ++++ libvirt-0.8.7/src/storage/storage_backend.c 2011-01-12 18:30:49.000000000 +0100 +@@ -131,7 +131,7 @@ virStorageBackendCopyToFD(virStorageVolD goto cleanup; } @@ -8,4 +8,4 @@ + memset(&zerobuf, 0, sizeof(zerobuf)); if (VIR_ALLOC_N(buf, bytes) < 0) { - virReportOOMError(conn); + ret = -errno; 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/libvorbis/patches/patch-ltmain_sh b/package/libvorbis/patches/patch-ltmain_sh new file mode 100644 index 000000000..c3d5bdd93 --- /dev/null +++ b/package/libvorbis/patches/patch-ltmain_sh @@ -0,0 +1,11 @@ +--- libvorbis-1.2.0.orig/ltmain.sh 2006-06-19 21:29:20.000000000 +0200 ++++ libvorbis-1.2.0/ltmain.sh 2011-01-15 21:27:10.000000000 +0100 +@@ -1623,7 +1623,7 @@ EOF + # -pg pass through profiling flag for GCC + # @file GCC response files + -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*|-pg| \ +- -t[45]*|-txscale*|@*) ++ -t[45]*|-txscale*|@*|-fstack-protector*|-flto) + + # Unknown arguments in both finalize_command and compile_command need + # to be aesthetically quoted because they are evaled later. diff --git a/package/libvorbisidec/patches/autotool.patch b/package/libvorbisidec/patches/autotool.patch index 830eb2e92..584000165 100644 --- a/package/libvorbisidec/patches/autotool.patch +++ b/package/libvorbisidec/patches/autotool.patch @@ -31435,7 +31435,7 @@ diff -Nur libvorbisidec-1.0.2+svn15687.orig/ltmain.sh libvorbisidec-1.0.2+svn156 + # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC + # @file GCC response files + -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) + func_quote_for_eval "$arg" + arg="$func_quote_for_eval_result" + func_append compile_command " $arg" diff --git a/package/libxkbfile/patches/patch-ltmain_sh b/package/libxkbfile/patches/patch-ltmain_sh new file mode 100644 index 000000000..74e4b6fba --- /dev/null +++ b/package/libxkbfile/patches/patch-ltmain_sh @@ -0,0 +1,11 @@ +--- libxkbfile-1.0.6.orig/ltmain.sh 2009-09-11 16:54:52.000000000 +0200 ++++ libxkbfile-1.0.6/ltmain.sh 2011-01-15 23:25:15.000000000 +0100 +@@ -1676,7 +1676,7 @@ EOF + # -F/path gives path to uninstalled frameworks, gcc on darwin + # @file GCC response files + -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) + + # Unknown arguments in both finalize_command and compile_command need + # to be aesthetically quoted because they are evaled later. diff --git a/package/libxml2/patches/patch-ltmain_sh b/package/libxml2/patches/patch-ltmain_sh new file mode 100644 index 000000000..e6279239d --- /dev/null +++ b/package/libxml2/patches/patch-ltmain_sh @@ -0,0 +1,11 @@ +--- libxml2-2.7.6.orig/ltmain.sh 2009-10-06 18:39:54.000000000 +0200 ++++ libxml2-2.7.6/ltmain.sh 2011-01-14 00:34:35.000000000 +0100 +@@ -4765,7 +4765,7 @@ func_mode_link () + # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC + # @file GCC response files + -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) + func_quote_for_eval "$arg" + arg="$func_quote_for_eval_result" + func_append compile_command " $arg" diff --git a/package/libxslt/patches/patch-libexslt_Makefile_in b/package/libxslt/patches/patch-libexslt_Makefile_in new file mode 100644 index 000000000..53165a669 --- /dev/null +++ b/package/libxslt/patches/patch-libexslt_Makefile_in @@ -0,0 +1,11 @@ +--- libxslt-1.1.24.orig/libexslt/Makefile.in 2008-05-13 17:52:13.000000000 +0200 ++++ libxslt-1.1.24/libexslt/Makefile.in 2011-01-11 17:04:29.000000000 +0100 +@@ -247,7 +247,7 @@ top_builddir = @top_builddir@ + top_srcdir = @top_srcdir@ + INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/libxslt -I$(top_srcdir)/libexslt \ + -I$(top_builddir) -I$(top_builddir)/libxslt \ +- -I$(top_builddir)/libexslt $(LIBXML_CFLAGS) $(CFLAGS) ++ -I$(top_builddir)/libexslt $(LIBXML_CFLAGS) + + AM_CFLAGS = $(LIBGCRYPT_CFLAGS) + lib_LTLIBRARIES = libexslt.la diff --git a/package/libxslt/patches/patch-ltmain_sh b/package/libxslt/patches/patch-ltmain_sh new file mode 100644 index 000000000..0c416e0cb --- /dev/null +++ b/package/libxslt/patches/patch-ltmain_sh @@ -0,0 +1,11 @@ +--- libxslt-1.1.24.orig/ltmain.sh 2007-08-29 14:28:46.000000000 +0200 ++++ libxslt-1.1.24/ltmain.sh 2011-01-15 21:29:56.000000000 +0100 +@@ -1663,7 +1663,7 @@ EOF + # -F/path gives path to uninstalled frameworks, gcc on darwin + # @file GCC response files + -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) + + # Unknown arguments in both finalize_command and compile_command need + # to be aesthetically quoted because they are evaled later. diff --git a/package/libxslt/patches/patch-xsltproc_Makefile_in b/package/libxslt/patches/patch-xsltproc_Makefile_in new file mode 100644 index 000000000..3802ce0fa --- /dev/null +++ b/package/libxslt/patches/patch-xsltproc_Makefile_in @@ -0,0 +1,11 @@ +--- libxslt-1.1.24.orig/xsltproc/Makefile.in 2008-05-13 17:52:15.000000000 +0200 ++++ libxslt-1.1.24/xsltproc/Makefile.in 2011-01-11 17:06:56.000000000 +0100 +@@ -234,7 +234,7 @@ top_builddir = @top_builddir@ + top_srcdir = @top_srcdir@ + INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/libxslt -I$(top_srcdir)/libexslt \ + -I$(top_builddir) -I$(top_builddir)/libxslt \ +- -I$(top_builddir)/libexslt $(LIBXML_CFLAGS) $(CFLAGS) ++ -I$(top_builddir)/libexslt $(LIBXML_CFLAGS) + + AM_CFLAGS = $(LIBGCRYPT_CFLAGS) + xsltproc_SOURCES = xsltproc.c diff --git a/package/lighttpd/patches/patch-ltmain_sh b/package/lighttpd/patches/patch-ltmain_sh new file mode 100644 index 000000000..3d6b6bde5 --- /dev/null +++ b/package/lighttpd/patches/patch-ltmain_sh @@ -0,0 +1,11 @@ +--- lighttpd-1.4.25.orig/ltmain.sh 2009-11-21 16:12:15.000000000 +0100 ++++ lighttpd-1.4.25/ltmain.sh 2011-01-15 23:27:09.000000000 +0100 +@@ -4765,7 +4765,7 @@ func_mode_link () + # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC + # @file GCC response files + -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) + func_quote_for_eval "$arg" + arg="$func_quote_for_eval_result" + func_append compile_command " $arg" diff --git a/package/links/Makefile b/package/links/Makefile index 33be6b148..462d4746b 100644 --- a/package/links/Makefile +++ b/package/links/Makefile @@ -14,7 +14,7 @@ PKG_BUILDDEP:= openssl libpng jpeg gpm PKG_URL:= http://links.twibright.com/ PKG_SITES:= http://links.twibright.com/download/ -PKG_FLAVOURS:= WITH_DIRECTFB +PKG_FLAVOURS_LINKS:= WITH_DIRECTFB PKGFD_WITH_DIRECTFB:= enable DirectFB video output support PKGFS_WITH_DIRECTFB:= directfb PKGFB_WITH_DIRECTFB:= DirectFB diff --git a/package/linux-atm/patches/patch-ltmain_sh b/package/linux-atm/patches/patch-ltmain_sh new file mode 100644 index 000000000..583f17839 --- /dev/null +++ b/package/linux-atm/patches/patch-ltmain_sh @@ -0,0 +1,11 @@ +--- linux-atm-2.5.1.orig/ltmain.sh 2008-08-30 00:27:10.000000000 +0200 ++++ linux-atm-2.5.1/ltmain.sh 2011-01-15 21:47:10.000000000 +0100 +@@ -1676,7 +1676,7 @@ EOF + # -F/path gives path to uninstalled frameworks, gcc on darwin + # @file GCC response files + -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) + + # Unknown arguments in both finalize_command and compile_command need + # to be aesthetically quoted because they are evaled later. diff --git a/package/logrotate/Makefile b/package/logrotate/Makefile index 1c7577ac2..884b2d0fb 100644 --- a/package/logrotate/Makefile +++ b/package/logrotate/Makefile @@ -18,7 +18,6 @@ include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,LOGROTATE,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) CONFIG_STYLE:= manual - TCFLAGS+= -D_GNU_SOURCE -DVERSION=\"$(PKG_VERSION)\" post-install: diff --git a/package/logrotate/patches/patch-Makefile b/package/logrotate/patches/patch-Makefile index 2b348b75f..755e612b1 100644 --- a/package/logrotate/patches/patch-Makefile +++ b/package/logrotate/patches/patch-Makefile @@ -1,6 +1,6 @@ --- logrotate-3.7.8.orig/Makefile 2008-05-19 12:25:54.000000000 +0200 -+++ logrotate-3.7.8/Makefile 2010-02-06 00:00:58.853084930 +0100 -@@ -1,7 +1,7 @@ ++++ logrotate-3.7.8/Makefile 2011-01-15 23:45:59.000000000 +0100 +@@ -1,10 +1,10 @@ VERSION = $(shell awk '/Version:/ { print $$2 }' logrotate.spec) -OS_NAME = $(shell uname -s) +OS_NAME = Linux @@ -9,8 +9,32 @@ +CFLAGS ?= -Wall -D_GNU_SOURCE -D$(OS_NAME) -DVERSION=\"$(VERSION)\" $(RPM_OPT_FLAGS) $(LFS) PROG = logrotate MAN = logrotate.8 - LOADLIBES = -lpopt -@@ -96,16 +96,16 @@ test: $(TARGET) +-LOADLIBES = -lpopt ++LIBS = -lpopt + SVNURL= svn+ssh://svn.fedorahosted.org/svn/logrotate + SVNPUBURL = http://svn.fedorahosted.org/svn/logrotate + SVNTAG = r$(subst .,-,$(VERSION)) +@@ -68,10 +68,7 @@ MANDIR = $(BASEDIR)/man + OBJS = logrotate.o log.o config.o basenames.o + SOURCES = $(subst .o,.c,$(OBJS) $(LIBOBJS)) + +-ifeq ($(RPM_OPT_FLAGS),) +-CFLAGS += -g +-LDFLAGS = -g +-endif ++LDFLAGS ?= + + ifeq (.depend,$(wildcard .depend)) + TARGET=$(PROG) +@@ -84,6 +81,7 @@ RCSVERSION = $(subst .,-,$(VERSION)) + all: $(TARGET) + + $(PROG): $(OBJS) ++ $(CC) $(LDFLAGS) -o $(PROG) $^ $(LIBS) + + clean: + rm -f $(OBJS) $(PROG) core* .depend +@@ -96,16 +94,16 @@ test: $(TARGET) (cd test; ./test) install: diff --git a/package/lsof/Makefile b/package/lsof/Makefile index 8f0706031..8bad858ae 100644 --- a/package/lsof/Makefile +++ b/package/lsof/Makefile @@ -5,17 +5,16 @@ include $(TOPDIR)/rules.mk PKG_NAME:= lsof PKG_VERSION:= 4.84 -PKG_RELEASE:= 1 +PKG_RELEASE:= 2 PKG_MD5SUM:= 6dae655988c810a7042c06a4e2fa3c5f PKG_DESCR:= list open files PKG_SECTION:= misc PKG_URL:= http://people.freebsd.org/~abe/ PKG_SITES:= ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/ -PKG_HOST_DEPENDS:= !darwin - DISTFILES:= ${PKG_NAME}_${PKG_VERSION}.tar.gz -WRKDIST= ${WRKDIR}/${PKG_NAME}_${PKG_VERSION}/${PKG_NAME}_${PKG_VERSION}_src +WRKDIST= ${WRKDIR}/${PKG_NAME}_${PKG_VERSION} +WRKSRC= ${WRKDIR}/${PKG_NAME}_${PKG_VERSION}/${PKG_NAME}_${PKG_VERSION}_src include $(TOPDIR)/mk/package.mk @@ -24,7 +23,7 @@ $(eval $(call PKG_template,LSOF,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_ CONFIG_STYLE:= minimal CONFIGURE_PROG:= Configure CONFIGURE_ARGS:= -n linux -XAKE_FLAGS+= CC='${TARGET_CC}' +XAKE_FLAGS+= CC='${TARGET_CC}' CFLAGS='${TARGET_CFLAGS}' CFGL='${TARGET_LDFLAGS} -L./lib -llsof' INSTALL_STYLE:= manual post-extract: diff --git a/package/lsof/patches/patch-Configure b/package/lsof/patches/patch-Configure deleted file mode 100644 index e99001293..000000000 --- a/package/lsof/patches/patch-Configure +++ /dev/null @@ -1,30 +0,0 @@ ---- lsof_4.84_src.orig/Configure 2010-07-29 17:59:32.000000000 +0200 -+++ lsof_4.84_src/Configure 2010-10-07 20:03:14.000000000 +0200 -@@ -2739,27 +2739,6 @@ return(0); } - then - LSOF_CFGF="$LSOF_CFGF -DHASIPv6" - fi # } -- -- # Test for SELinux support. -- -- LSOF_TMP1=0 -- if test "X$LINUX_HASSELINUX" = "X" # { -- then -- if test -r ${LSOF_INCLUDE}/selinux/selinux.h # { -- then -- LSOF_TMP1=1 -- fi # } -- else -- if test "X$LINUX_HASSELINUX" = "XY" -o "X$LINUX_HASSELINUX" = "Xy" # { -- then -- LSOF_TMP1=1 -- fi # } -- fi # } -- if test $LSOF_TMP1 -eq 1 # { -- then -- LSOF_CFGF="$LSOF_CFGF -DHASSELINUX" -- LSOF_CFGL="$LSOF_CFGL -lselinux" -- fi # } - LSOF_DIALECT_DIR="linux" - LSOF_CFGF="$LSOF_CFGF -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE" - ;; diff --git a/package/lsof/patches/patch-lsof_4_84_src_Configure b/package/lsof/patches/patch-lsof_4_84_src_Configure new file mode 100644 index 000000000..b1ca02fef --- /dev/null +++ b/package/lsof/patches/patch-lsof_4_84_src_Configure @@ -0,0 +1,17 @@ +--- lsof_4.84.orig/lsof_4.84_src/Configure 2010-07-29 17:59:32.000000000 +0200 ++++ lsof_4.84/lsof_4.84_src/Configure 2011-01-15 23:57:34.000000000 +0100 +@@ -5357,12 +5357,12 @@ then + if test "X$LSOF_RANLIB" != "X" # { + then + echo "" >> ${LSOF_LIB}/$LSOF_LIBMKF +- echo "RANLIB= $LSOF_RANLIB \${LIB}" >> ${LSOF_LIB}/$LSOF_LIBMKF ++ echo "RANLIB?= $LSOF_RANLIB" >> ${LSOF_LIB}/$LSOF_LIBMKF + fi # } + echo "" >> ${LSOF_LIB}/$LSOF_LIBMKF + if test "X$LSOF_CFLAGS_OVERRIDE" = "X" # { + then +- echo "CFLAGS= \${CDEFS} \${INCL} \${DEBUG}" >> ${LSOF_LIB}/$LSOF_LIBMKF ++ echo "CFLAGS?= \${CDEFS} \${INCL} \${DEBUG}" >> ${LSOF_LIB}/$LSOF_LIBMKF + else + echo "override CFLAGS=\${CDEFS} \${INCL} \${DEBUG}" >> ${LSOF_LIB}/$LSOF_LIBMKF + fi # } diff --git a/package/lsof/patches/patch-dialects_linux_dlsof_h b/package/lsof/patches/patch-lsof_4_84_src_dialects_linux_dlsof_h index 1b6314849..b15a001b1 100644 --- a/package/lsof/patches/patch-dialects_linux_dlsof_h +++ b/package/lsof/patches/patch-lsof_4_84_src_dialects_linux_dlsof_h @@ -1,5 +1,5 @@ ---- lsof_4.84_src.orig/dialects/linux/dlsof.h 2010-01-18 20:03:19.000000000 +0100 -+++ lsof_4.84_src/dialects/linux/dlsof.h 2010-10-07 20:35:57.000000000 +0200 +--- lsof_4.84.orig/lsof_4.84_src/dialects/linux/dlsof.h 2010-01-18 20:03:19.000000000 +0100 ++++ lsof_4.84/lsof_4.84_src/dialects/linux/dlsof.h 2011-01-16 00:01:43.000000000 +0100 @@ -49,13 +49,7 @@ #include <setjmp.h> #include <unistd.h> diff --git a/package/lsof/patches/patch-dialects_linux_machine_h b/package/lsof/patches/patch-lsof_4_84_src_dialects_linux_machine_h index 011144644..6066b38d8 100644 --- a/package/lsof/patches/patch-dialects_linux_machine_h +++ b/package/lsof/patches/patch-lsof_4_84_src_dialects_linux_machine_h @@ -1,5 +1,5 @@ ---- lsof_4.84_src.orig/dialects/linux/machine.h 2010-07-29 18:02:52.000000000 +0200 -+++ lsof_4.84_src/dialects/linux/machine.h 2010-10-07 20:03:14.000000000 +0200 +--- lsof_4.84.orig/lsof_4.84_src/dialects/linux/machine.h 2010-07-29 18:02:52.000000000 +0200 ++++ lsof_4.84/lsof_4.84_src/dialects/linux/machine.h 2011-01-16 00:01:48.000000000 +0100 @@ -632,6 +632,6 @@ * zeromem is a macro that uses bzero or memset. */ diff --git a/package/lsof/patches/patch-lsof_4_84_src_lib_Makefile_skel b/package/lsof/patches/patch-lsof_4_84_src_lib_Makefile_skel new file mode 100644 index 000000000..8cada0635 --- /dev/null +++ b/package/lsof/patches/patch-lsof_4_84_src_lib_Makefile_skel @@ -0,0 +1,11 @@ +--- lsof_4.84.orig/lsof_4.84_src/lib/Makefile.skel 2001-02-13 03:12:22.000000000 +0100 ++++ lsof_4.84/lsof_4.84_src/lib/Makefile.skel 2011-01-15 23:58:50.000000000 +0100 +@@ -22,7 +22,7 @@ all: ${LIB} + + ${LIB}: ${OBJ} + ${AR} +- ${RANLIB} ++ ${RANLIB} ${LIB} + + clean: FRC + rm -f ${LIB} ${OBJ} errs Makefile.bak a.out core diff --git a/package/lvm/Makefile b/package/lvm/Makefile index b45a262e1..67ae4d6cc 100644 --- a/package/lvm/Makefile +++ b/package/lvm/Makefile @@ -4,9 +4,9 @@ include ${TOPDIR}/rules.mk PKG_NAME:= lvm -PKG_VERSION:= 2.02.79 +PKG_VERSION:= 2.02.80 PKG_RELEASE:= 1 -PKG_MD5SUM:= e6929251a90b0b626c024942a242f337 +PKG_MD5SUM:= 816f4cee75674e3a21fd40f1961279f2 PKG_DESCR:= logical volume management PKG_SECTION:= fs PKG_DEPENDS:= libdevmapper libncurses @@ -31,15 +31,16 @@ CONFIGURE_ARGS+= --with-user="" --with-group="" \ --with-optimisation="" \ --with-lvm1=none -post-install: - # lvm +lvm-install: ${INSTALL_DIR} ${IDIR_LVM}/usr/sbin ${INSTALL_BIN} ${WRKINST}/usr/sbin/lvm ${IDIR_LVM}/usr/sbin/lvm - # libdevmapper + +libdevmapper-install: ${INSTALL_DIR} ${IDIR_LIBDEVMAPPER}/usr/lib ${CP} ${WRKINST}/usr/lib/libdevmapper.so* \ ${IDIR_LIBDEVMAPPER}/usr/lib - # device-mapper + +device-mapper-install: ${INSTALL_DIR} ${IDIR_DEVICE_MAPPER}/usr/sbin ${INSTALL_BIN} ${WRKINST}/usr/sbin/dmsetup \ ${IDIR_DEVICE_MAPPER}/usr/sbin 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/lvm/patches/patch-make_tmpl_in b/package/lvm/patches/patch-make_tmpl_in index 43bd07008..f5286dfa4 100644 --- a/package/lvm/patches/patch-make_tmpl_in +++ b/package/lvm/patches/patch-make_tmpl_in @@ -1,5 +1,14 @@ ---- LVM2.2.02.79.orig/make.tmpl.in 2010-11-05 17:18:38.000000000 +0100 -+++ LVM2.2.02.79/make.tmpl.in 2010-12-26 22:15:11.000000000 +0100 +--- LVM2.2.02.80.orig/make.tmpl.in 2011-01-10 14:00:53.000000000 +0100 ++++ LVM2.2.02.80/make.tmpl.in 2011-01-11 11:39:53.000000000 +0100 +@@ -33,7 +33,7 @@ LIBS = @LIBS@ + # Extra libraries always linked with static binaries + STATIC_LIBS = $(SELINUX_LIBS) $(UDEV_LIBS) + DEFS += @DEFS@ +-CFLAGS += @CFLAGS@ ++CFLAGS = @CFLAGS@ + CLDFLAGS += @CLDFLAGS@ + LDDEPS += @LDDEPS@ + LDFLAGS += @LDFLAGS@ @@ -322,7 +322,8 @@ $(LIB_SHARED): $(LIB_SHARED).$(LIB_VERSI $(LN_S) -f $(<F) $@ diff --git a/package/microperl/patches/patch-Makefile_micro b/package/microperl/patches/patch-Makefile_micro index 38cedeff7..01bca8bdc 100644 --- a/package/microperl/patches/patch-Makefile_micro +++ b/package/microperl/patches/patch-Makefile_micro @@ -1,6 +1,15 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $ --- perl-5.10.0.orig/Makefile.micro 2007-12-18 11:47:07.000000000 +0100 -+++ perl-5.10.0/Makefile.micro 2009-09-14 18:52:23.000000000 +0200 ++++ perl-5.10.0/Makefile.micro 2011-01-16 00:16:05.000000000 +0100 +@@ -3,7 +3,7 @@ CCFLAGS = -c + DEFINES = -DPERL_CORE -DPERL_MICRO -DSTANDARD_C -DPERL_USE_SAFE_PUTENV + OPTIMIZE = + CFLAGS = $(DEFINES) $(OPTIMIZE) +-LDFLAGS = ++LDFLAGS ?= + LIBS = -lm + _O = .o + ENV = env @@ -46,7 +46,7 @@ Config = '$$Config{$$1}' patch_uconfig: $(PERL) -MConfig -pi -e "s/^((?:short|int|long(?:dbl|long)?|ptr|double|[iun]v|u?quad|[iu]\d+|fpos|lseek)(?:size|type)|byteorder|d_quad|quadkind|use64.+)=.*/\\1='"$(Config)"'/g" uconfig.shx diff --git a/package/miredo/patches/patch-admin_ltmain_sh b/package/miredo/patches/patch-admin_ltmain_sh new file mode 100644 index 000000000..af6e9f095 --- /dev/null +++ b/package/miredo/patches/patch-admin_ltmain_sh @@ -0,0 +1,11 @@ +--- miredo-1.2.3.orig/admin/ltmain.sh 2009-12-10 00:55:19.000000000 +0100 ++++ miredo-1.2.3/admin/ltmain.sh 2011-01-16 00:19:27.000000000 +0100 +@@ -4765,7 +4765,7 @@ func_mode_link () + # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC + # @file GCC response files + -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) + func_quote_for_eval "$arg" + arg="$func_quote_for_eval_result" + func_append compile_command " $arg" diff --git a/package/mksh/Makefile b/package/mksh/Makefile index 7ace9de29..84dee864e 100644 --- a/package/mksh/Makefile +++ b/package/mksh/Makefile @@ -12,7 +12,7 @@ PKG_SECTION:= shells PKG_URL:= http://www.mirbsd.org/ PKG_SITES:= ${MASTER_SITE_MIRBSD:distfiles/=dist/mir/mksh/} -PKG_FLAVOURS:= FULL +PKG_FLAVOURS_MKSH:= FULL PKGFD_FULL:= Include all features DISTFILES= ${PKG_NAME}-R${PKG_VERSION}.cpio.gz diff --git a/package/moc/patches/patch-ltmain_sh b/package/moc/patches/patch-ltmain_sh new file mode 100644 index 000000000..b9a79ecd3 --- /dev/null +++ b/package/moc/patches/patch-ltmain_sh @@ -0,0 +1,11 @@ +--- moc-2.5.0-alpha4.orig/ltmain.sh 2009-09-25 10:57:23.000000000 +0200 ++++ moc-2.5.0-alpha4/ltmain.sh 2011-01-16 00:22:15.000000000 +0100 +@@ -4765,7 +4765,7 @@ func_mode_link () + # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC + # @file GCC response files + -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) + func_quote_for_eval "$arg" + arg="$func_quote_for_eval_result" + func_append compile_command " $arg" diff --git a/package/mpd/Makefile b/package/mpd/Makefile index 522b804b6..b211386b0 100644 --- a/package/mpd/Makefile +++ b/package/mpd/Makefile @@ -14,9 +14,9 @@ PKG_BUILDDEP:= glib PKG_URL:= http://mpd.wikia.com/wiki/Music_Player_Daemon_Wiki PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=musicpd/} -PKG_FLAVOURS:= WITH_ALSA WITH_AO WITH_MP3 WITH_MP4 WITH_TREMOR -PKG_FLAVOURS+= WITH_OGG WITH_FLAC WITH_WAV WITH_MMS WITH_FFMPEG -PKG_FLAVOURS+= WITH_SHOUT WITH_CURL +PKG_FLAVOURS_MPD:= WITH_ALSA WITH_AO WITH_MP3 WITH_MP4 WITH_TREMOR +PKG_FLAVOURS_MPD+= WITH_OGG WITH_FLAC WITH_WAV WITH_MMS WITH_FFMPEG +PKG_FLAVOURS_MPD+= WITH_SHOUT WITH_CURL PKGFD_WITH_ALSA:= enable ALSA output PKGFS_WITH_ALSA:= alsa-lib diff --git a/package/mpfr/patches/patch-ltmain_sh b/package/mpfr/patches/patch-ltmain_sh new file mode 100644 index 000000000..117f89c34 --- /dev/null +++ b/package/mpfr/patches/patch-ltmain_sh @@ -0,0 +1,11 @@ +--- mpfr-2.4.2.orig/ltmain.sh 2009-11-30 03:43:54.000000000 +0100 ++++ mpfr-2.4.2/ltmain.sh 2011-01-15 14:26:14.000000000 +0100 +@@ -4765,7 +4765,7 @@ func_mode_link () + # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC + # @file GCC response files + -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) + func_quote_for_eval "$arg" + arg="$func_quote_for_eval_result" + func_append compile_command " $arg" diff --git a/package/mpg123/patches/patch-build_ltmain_sh b/package/mpg123/patches/patch-build_ltmain_sh new file mode 100644 index 000000000..f2c5aadfa --- /dev/null +++ b/package/mpg123/patches/patch-build_ltmain_sh @@ -0,0 +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 + -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) + func_quote_for_eval "$arg" + arg="$func_quote_for_eval_result" + func_append compile_command " $arg" diff --git a/package/mplayer/Makefile b/package/mplayer/Makefile index bad5c656d..21ad00432 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 @@ -19,7 +19,7 @@ PKG_SITES:= http://openadk.org/distfiles/ PKG_ARCH_DEPENDS:= x86 x86_64 mips mipsel mips64 mips64el -PKG_FLAVOURS:= WITH_DIRECTFB +PKG_FLAVOURS_MPLAYER:= WITH_DIRECTFB PKGFD_WITH_DIRECTFB:= enable DirectFB video output support PKGFS_WITH_DIRECTFB:= directfb PKGFB_WITH_DIRECTFB:= DirectFB @@ -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/mrd6/Makefile b/package/mrd6/Makefile index 745718a2a..1638eaf9e 100644 --- a/package/mrd6/Makefile +++ b/package/mrd6/Makefile @@ -11,6 +11,7 @@ PKG_DESCR:= IPv6 multicast routing daemon PKG_SECTION:= ipv6 PKG_DEPENDS:= kmod-ipv6 PKG_SITES:= http://www.openadk.org/distfiles/ +PKG_NEED_CXX:= 1 PKG_CXX:= MRD6 WRKBUILD= ${WRKSRC}/src @@ -21,10 +22,15 @@ $(eval $(call PKG_template,MRD6,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_ CONFIG_STYLE:= manual +LIBRARIES:=-nodefaultlibs -luClibc++ +ifeq ($(ADK_TOOLCHAIN_GCC_USE_SSP),y) +LIBRARIES+=-lssp -lssp_nonshared +endif + ifeq (${ADK_COMPILE_MRD6_WITH_UCLIBCXX},y) -TCXXFLAGS+= -fno-builtin -nostdinc++ -nodefaultlibs \ +TCXXFLAGS+= -fno-builtin -nostdinc++ \ -I${STAGING_TARGET_DIR}/usr/include/uClibc++ -TLDFLAGS+= -nodefaultlibs -luClibc++ -shared +TLDFLAGS+= -shared ${LIBRARIES} endif XAKE_FLAGS+= EXTRA_FLAGS="${TCFLAGS}" diff --git a/package/mysql/patches/patch-configure b/package/mysql/patches/patch-configure index aad04ff2b..853c31f7f 100644 --- a/package/mysql/patches/patch-configure +++ b/package/mysql/patches/patch-configure @@ -1,6 +1,22 @@ --- mysql-5.1.48.orig/configure 2010-06-03 17:54:47.000000000 +0200 -+++ mysql-5.1.48/configure 2010-07-30 11:04:50.000000000 +0200 -@@ -19825,45 +19825,7 @@ fi ++++ mysql-5.1.48/configure 2011-01-15 12:58:47.000000000 +0100 +@@ -19764,15 +19764,6 @@ fi + + + +-# Enable the abi_check rule only if gcc is available +- +-if test "$GCC" != "yes" || expr "$CC" : ".*icc.*" +-then +- ABI_CHECK="" +-else +- ABI_CHECK="abi_check" +-fi +- + + + # Look for PS usage. We use double dollar-signs in FIND_PROC because this +@@ -19825,45 +19816,7 @@ fi $as_echo_n "checking \"how to check if pid exists\"... " >&6; } PS=$ac_cv_path_PS # Linux style @@ -47,7 +63,7 @@ { $as_echo "$as_me:$LINENO: result: \"$FIND_PROC\"" >&5 $as_echo "\"$FIND_PROC\"" >&6; } -@@ -48273,197 +48235,14 @@ $as_echo "$as_me: error: unknown endiann +@@ -48273,197 +48226,14 @@ $as_echo "$as_me: error: unknown endiann esac @@ -245,7 +261,7 @@ { $as_echo "$as_me:$LINENO: checking whether Solaris libc atomic functions are available" >&5 $as_echo_n "checking whether Solaris libc atomic functions are available... " >&6; } -@@ -48581,101 +48360,6 @@ fi +@@ -48581,101 +48351,6 @@ fi done diff --git a/package/mysql/patches/patch-include_config_h_in b/package/mysql/patches/patch-include_config_h_in index 8c39a7c51..361a8b651 100644 --- a/package/mysql/patches/patch-include_config_h_in +++ b/package/mysql/patches/patch-include_config_h_in @@ -1,11 +1,11 @@ --- mysql-5.1.48.orig/include/config.h.in 2010-06-03 17:54:04.000000000 +0200 -+++ mysql-5.1.48/include/config.h.in 2010-07-12 22:52:37.985862985 +0200 ++++ mysql-5.1.48/include/config.h.in 2011-01-15 13:01:30.000000000 +0100 @@ -856,7 +856,7 @@ /* Define to 1 if you have the `strtoull' function. */ #undef HAVE_STRTOULL -/* Define to 1 if `st_rdev' is member of `struct stat'. */ -+/* Define to 1 if `struct stat' is a member of `st_rdev'. */ ++/* Define to 1 if `st_rdev' is a member of `struct stat'. */ #undef HAVE_STRUCT_STAT_ST_RDEV /* Define to 1 if your `struct stat' has `st_rdev'. Deprecated, use diff --git a/package/mysql/patches/patch-ltmain_sh b/package/mysql/patches/patch-ltmain_sh new file mode 100644 index 000000000..c5cb790cf --- /dev/null +++ b/package/mysql/patches/patch-ltmain_sh @@ -0,0 +1,11 @@ +--- mysql-5.1.48.orig/ltmain.sh 2010-06-03 17:54:04.000000000 +0200 ++++ mysql-5.1.48/ltmain.sh 2011-01-15 13:03:34.000000000 +0100 +@@ -4765,7 +4765,7 @@ func_mode_link () + # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC + # @file GCC response files + -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) + func_quote_for_eval "$arg" + arg="$func_quote_for_eval_result" + func_append compile_command " $arg" diff --git a/package/nano/Makefile b/package/nano/Makefile index df45c05d4..af87dd3f1 100644 --- a/package/nano/Makefile +++ b/package/nano/Makefile @@ -14,7 +14,7 @@ PKG_BUILDDEP:= ncurses PKG_URL:= http://www.nano-editor.org/ PKG_SITES:= http://www.nano-editor.org/dist/v2.2/ -PKG_FLAVOURS:= TINY +PKG_FLAVOURS_NANO:= TINY PKGFD_TINY:= tiny nano include ${TOPDIR}/mk/package.mk diff --git a/package/ncurses/Makefile b/package/ncurses/Makefile index c1b142dff..975cfa1b7 100644 --- a/package/ncurses/Makefile +++ b/package/ncurses/Makefile @@ -16,15 +16,14 @@ PKG_SUBPKGS:= LIBNCURSES LIBNCURSES_DEV PKGSD_LIBNCURSES_DEV:= development files for libncurses PKGSC_LIBNCURSES_DEV:= devel +PKG_FLAVOURS_LIBNCURSES:= FULL_TERMINFO +PKGFD_FULL_TERMINFO:= install the complete set of terminfo files as provided upstream + 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 \ @@ -64,15 +63,18 @@ 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 # libcurses will not show up in the IPKG, only in STAGING_TARGET_DIR - ${INSTALL_DIR} ${IDIR_LIBNCURSES}/usr/share/terminfo ${INSTALL_DIR} ${IDIR_LIBNCURSES}/usr/lib ${CP} ${WRKINST}/usr/lib/lib{form,menu,ncurses,panel}.so* \ ${IDIR_LIBNCURSES}/usr/lib +ifeq (${ADK_PACKAGE_LIBNCURSES_FULL_TERMINFO},y) + ${INSTALL_DIR} ${IDIR_LIBNCURSES}/usr/share + ${CP} ${WRKINST}/usr/share/terminfo ${IDIR_LIBNCURSES}/usr/share/ +else ${INSTALL_DIR} ${IDIR_LIBNCURSES}/usr/share/terminfo/ for f in ansi dumb linux screen vt100 vt102 \ rxvt-unicode vt220 xterm xterm-color xterm-xfree86; do \ @@ -80,6 +82,7 @@ post-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y} ${INSTALL_DATA} ${WRKINST}/usr/share/terminfo/*/$$f \ ${IDIR_LIBNCURSES}/usr/share/terminfo/$${f:0:1}/$$f; \ done +endif libncurses-dev-install: ${INSTALL_DIR} ${IDIR_LIBNCURSES_DEV}/usr/include diff --git a/package/neon/patches/patch-ltmain_sh b/package/neon/patches/patch-ltmain_sh new file mode 100644 index 000000000..2655e933d --- /dev/null +++ b/package/neon/patches/patch-ltmain_sh @@ -0,0 +1,11 @@ +--- neon-0.29.4.orig/ltmain.sh 2010-10-01 14:35:13.000000000 +0200 ++++ neon-0.29.4/ltmain.sh 2011-01-14 21:29:01.000000000 +0100 +@@ -4765,7 +4765,7 @@ func_mode_link () + # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC + # @file GCC response files + -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) + func_quote_for_eval "$arg" + arg="$func_quote_for_eval_result" + func_append compile_command " $arg" diff --git a/package/net-snmp/Makefile b/package/net-snmp/Makefile index 38e7941c0..d32401d33 100644 --- a/package/net-snmp/Makefile +++ b/package/net-snmp/Makefile @@ -4,13 +4,13 @@ include ${TOPDIR}/rules.mk PKG_NAME:= net-snmp -PKG_VERSION:= 5.5 -PKG_RELEASE:= 2 -PKG_MD5SUM:= 5b2551e7bd024fbbee84dca22a5f13a1 +PKG_VERSION:= 5.6.1 +PKG_RELEASE:= 1 +PKG_MD5SUM:= b4e30ead5783b0bb1d280172c6095ea4 PKG_DESCR:= SNMP Agent PKG_SECTION:= net/misc -PKG_DEPENDS:= libnetsnmp libelf -PKG_BUILDDEP:= libelf +PKG_DEPENDS:= libnetsnmp libelf libnl +PKG_BUILDDEP:= libelf libnl PKG_URL:= http://www.net-snmp.org/ PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=net-snmp/} PKG_NOPARALLEL:= 1 @@ -22,7 +22,7 @@ PKGSD_LIBNETSNMP:= SNMP library PKGSS_LIBNETSNMP:= libelf PKGSC_LIBNETSNMP:= libs -PKG_FLAVOURS:= WITH_IPV6 +PKG_FLAVOURS_SNMPD:= WITH_IPV6 PKGFD_WITH_IPV6:= enable IPv6 support include ${TOPDIR}/mk/package.mk @@ -33,7 +33,7 @@ $(eval $(call PKG_template,LIBNETSNMP,libnetsnmp,${PKG_VERSION}-${PKG_RELEASE},$ SNMP_TRANSPORTS_INCLUDED:= UDP TCP Callback Unix SNMP_TRANSPORTS_EXCLUDED:= Alias -ifneq (${ADK_PACKAGE_NET_SNMP_WITH_IPV6},) +ifneq (${ADK_PACKAGE_SNMPD_WITH_IPV6},) SNMP_TRANSPORTS_INCLUDED+= TCPIPv6 UDPIPv6 else SNMP_TRANSPORTS_EXCLUDED:= TCPIPv6 UDPIPv6 @@ -61,7 +61,7 @@ CONFIGURE_ARGS+= --with-defaults \ --without-rpm \ --without-zlib -ifneq (${ADK_PACKAGE_NET_SNMP_WITH_IPV6},) +ifneq (${ADK_PACKAGE_SNMPD_WITH_IPV6},) CONFIGURE_ARGS+= --enable-ipv6 else CONFIGURE_ARGS+= --disable-ipv6 @@ -69,13 +69,17 @@ endif FAKE_FLAGS+= INSTALL_PREFIX="${WRKINST}" -post-install: +libnetsnmp-install: ${INSTALL_DIR} ${IDIR_LIBNETSNMP}/usr/lib ${CP} ${WRKINST}/usr/lib/libnetsnmp*.so* ${IDIR_LIBNETSNMP}/usr/lib/ + +snmpd-install: ${INSTALL_DIR} ${IDIR_SNMPD}/etc/snmp ${INSTALL_DIR} ${IDIR_SNMPD}/usr/sbin ${INSTALL_DATA} ./files/snmpd.conf ${IDIR_SNMPD}/etc/snmp/snmpd.conf ${INSTALL_BIN} ${WRKINST}/usr/sbin/snmpd ${IDIR_SNMPD}/usr/sbin/snmpd + +snmp-utils-install: ${INSTALL_DIR} ${IDIR_SNMP_UTILS}/usr/bin ${CP} ${WRKINST}/usr/bin/snmp{get,set,status,test,trap,walk} \ ${IDIR_SNMP_UTILS}/usr/bin/ diff --git a/package/net-snmp/patches/patch-agent_mibgroup_mibII_tcpTable_c b/package/net-snmp/patches/patch-agent_mibgroup_mibII_tcpTable_c new file mode 100644 index 000000000..f0be57e78 --- /dev/null +++ b/package/net-snmp/patches/patch-agent_mibgroup_mibII_tcpTable_c @@ -0,0 +1,48 @@ +--- net-snmp-5.6.1.orig/agent/mibgroup/mibII/tcpTable.c 2010-10-20 15:12:08.000000000 +0200 ++++ net-snmp-5.6.1/agent/mibgroup/mibII/tcpTable.c 2011-01-12 14:48:14.000000000 +0100 +@@ -33,6 +33,12 @@ + #include <netlink/netlink.h> + #include <netlink/msg.h> + #include <linux/inet_diag.h> ++ ++/* libnl 2.0 compatibility code */ ++#define nl_handle nl_sock ++#define nl_handle_alloc nl_socket_alloc ++#define nl_handle_alloc_cb nl_socket_alloc_cb ++#define nl_handle_destroy nl_socket_free + #endif + + #include <net-snmp/net-snmp-includes.h> +@@ -565,8 +571,8 @@ tcpTable_load_netlink(void) + } + + if (nl_connect(nl, NETLINK_INET_DIAG) < 0) { +- DEBUGMSGTL(("mibII/tcpTable", "Failed to connect to netlink: %s\n", nl_geterror())); +- snmp_log(LOG_ERR, "snmpd: Couldn't connect to netlink: %s\n", nl_geterror()); ++ DEBUGMSGTL(("mibII/tcpTable", "Failed to connect to netlink: %s\n", nl_geterror(1))); ++ snmp_log(LOG_ERR, "snmpd: Couldn't connect to netlink: %s\n", nl_geterror(1)); + nl_handle_destroy(nl); + return -1; + } +@@ -580,8 +586,8 @@ tcpTable_load_netlink(void) + nlmsg_append(nm, &req, sizeof(struct inet_diag_req), 0); + + if (nl_send_auto_complete(nl, nm) < 0) { +- DEBUGMSGTL(("mibII/tcpTable", "nl_send_autocomplete(): %s\n", nl_geterror())); +- snmp_log(LOG_ERR, "snmpd: nl_send_autocomplete(): %s\n", nl_geterror()); ++ DEBUGMSGTL(("mibII/tcpTable", "nl_send_autocomplete(): %s\n", nl_geterror(1))); ++ snmp_log(LOG_ERR, "snmpd: nl_send_autocomplete(): %s\n", nl_geterror(1)); + nl_handle_destroy(nl); + return -1; + } +@@ -593,8 +599,8 @@ tcpTable_load_netlink(void) + + while (running) { + if ((len = nl_recv(nl, &peer, &buf, NULL)) <= 0) { +- DEBUGMSGTL(("mibII/tcpTable", "nl_recv(): %s\n", nl_geterror())); +- snmp_log(LOG_ERR, "snmpd: nl_recv(): %s\n", nl_geterror()); ++ DEBUGMSGTL(("mibII/tcpTable", "nl_recv(): %s\n", nl_geterror(1))); ++ snmp_log(LOG_ERR, "snmpd: nl_recv(): %s\n", nl_geterror(1)); + nl_handle_destroy(nl); + return -1; + } diff --git a/package/nfs-utils/Makefile b/package/nfs-utils/Makefile index 86c1a9e71..3d55b6260 100644 --- a/package/nfs-utils/Makefile +++ b/package/nfs-utils/Makefile @@ -13,7 +13,7 @@ PKG_DEPENDS:= kmod-nfsd portmap PKG_URL:= http://sourceforge.net/projects/nfs PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=nfs/} -PKG_FLAVOURS:= WITH_KERBEROS WITH_TIRPC +PKG_FLAVOURS_NFS_UTILS:=WITH_KERBEROS WITH_TIRPC PKGFD_WITH_KERBEROS:= enable Kerberos support (MIT) PKGFS_WITH_KERBEROS:= libkrb5 libevent libnfsidmap librpcsecgss libcom-err libgssglue PKGFB_WITH_KERBEROS:= libnfsidmap krb5 libevent libgssglue librpcsecgss diff --git a/package/nmap/Makefile b/package/nmap/Makefile index 57f986ea4..14d7110a4 100644 --- a/package/nmap/Makefile +++ b/package/nmap/Makefile @@ -13,6 +13,7 @@ PKG_DEPENDS:= libdnet libpcap libpcre PKG_BUILDDEP:= libdnet libpcap pcre PKG_URL:= http://nmap.org/ PKG_SITES:= http://download.insecure.org/nmap/dist/ +PKG_NEED_CXX:= 1 PKG_CXX:= NMAP DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 @@ -21,11 +22,16 @@ include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,NMAP,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +LIBRARIES:=-nodefaultlibs -luClibc++ -lgcc -lm +ifeq ($(ADK_TOOLCHAIN_GCC_USE_SSP),y) +LIBRARIES+=-lssp -lssp_nonshared +endif + TCPPFLAGS+= -DNOLUA ifeq ($(ADK_COMPILE_NMAP_WITH_UCLIBCXX),y) CONFIGURE_ENV+= CXXFLAGS="-fno-threadsafe-statics -fno-builtin -fno-rtti -nostdinc++ \ -I${STAGING_TARGET_DIR}/usr/include/uClibc++" \ - LIBS="-nodefaultlibs -luClibc++ -lgcc -lm" + LIBS="${LIBRARIES}" endif CONFIGURE_ARGS+= --without-openssl \ --without-zenmap \ diff --git a/package/nut/Makefile b/package/nut/Makefile index 833f271e7..6af495cb6 100644 --- a/package/nut/Makefile +++ b/package/nut/Makefile @@ -12,16 +12,16 @@ PKG_SECTION:= net/misc PKG_URL:= http://www.networkupstools.org/ PKG_SITES:= http://www.networkupstools.org/source/2.4/ -PKG_FLAVOURS:= SSL SNMP USB -PKGFD_SNMP:= enable SNMP support -PKGFS_SNMP:= libnetsnmp -PKGFB_SNMP:= net-snmp -PKGFD_USB:= enable USB support -PKGFS_USB:= libusb -PKGFB_USB:= libusb -PKGFD_SSL:= enable SSL support -PKGFS_SSL:= libopenssl -PKGFB_SSL:= openssl +PKG_FLAVOURS_NUT:= WITH_SSL WITH_SNMP WITH_USB +PKGFD_WITH_SNMP:= enable SNMP support +PKGFS_WITH_SNMP:= libnetsnmp +PKGFB_WITH_SNMP:= net-snmp +PKGFD_WITH_USB:= enable USB support +PKGFS_WITH_USB:= libusb +PKGFB_WITH_USB:= libusb +PKGFD_WITH_SSL:= enable SSL support +PKGFS_WITH_SSL:= libopenssl +PKGFB_WITH_SSL:= openssl include ${TOPDIR}/mk/package.mk @@ -65,10 +65,10 @@ $(eval $(call DRIVER_template,RHINO,rhino)) CONFIG_DRIVERS=$(shell echo ${DRIVERS_y} | tr ' ' ',') INSTALL_DRIVERS_tmp=${DRIVERS_y} -ifneq (${ADK_PACKAGE_NUT_USB},) +ifneq (${ADK_PACKAGE_NUT_WITH_USB},) INSTALL_DRIVERS_tmp+= usbhid-ups tripplite_usb endif -ifneq (${ADK_PACKAGE_NUT_SNMP},) +ifneq (${ADK_PACKAGE_NUT_WITH_SNMP},) INSTALL_DRIVERS_tmp+= snmp-ups endif INSTALL_DRIVERS=$(shell echo ${INSTALL_DRIVERS_tmp} | tr ' ' ',') @@ -79,7 +79,7 @@ CONFIGURE_ARGS+= --with-linux-hiddev=${LINUX_DIR}/include/linux/hiddev.h \ --with-group=0 \ --with-user=0 -ifneq (${ADK_PACKAGE_NUT_SSL},) +ifneq (${ADK_PACKAGE_NUT_WITH_SSL},) CONFIGURE_ARGS+= --with-ssl CONFIGURE_ENV+= CPPFLAGS="${TCPPFLAGS} ${TLDFLAGS}" MAKE_FLAGS+= SSL_CFLAGS="${TCPPFLAGS}" SSL_LDFLAGS="${TLDFLAGS} -lssl -lcrypto" @@ -88,11 +88,11 @@ endif ALL_TARGET:= all INSTALL_TARGET:= install -ifneq (${ADK_PACKAGE_NUT_USB},) +ifneq (${ADK_PACKAGE_NUT_WITH_USB},) ALL_TARGET+= usb INSTALL_TARGET+= install-usb endif -ifneq (${ADK_PACKAGE_NUT_SNMP},) +ifneq (${ADK_PACKAGE_NUT_WITH_SNMP},) ALL_TARGET+= snmp INSTALL_TARGET+= install-snmp endif @@ -108,10 +108,5 @@ post-install: ${INSTALL_BIN} ${WRKINST}/usr/bin/ups{c,cmd,drvctl,log,rw} \ ${IDIR_NUT}/usr/bin/ ${INSTALL_DATA} ./files/ups{d,}.conf ${IDIR_NUT}/etc/ -ifneq (${ADK_PACKAGE_NUT_VARDESC},) - ${INSTALL_DIR} ${IDIR_NUT}/usr/share - ${INSTALL_DATA} ${WRKINST}/usr/share/cmdvartab \ - ${IDIR_NUT}/usr/share/ -endif include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/nut/patches/patch-ltmain_sh b/package/nut/patches/patch-ltmain_sh new file mode 100644 index 000000000..806117687 --- /dev/null +++ b/package/nut/patches/patch-ltmain_sh @@ -0,0 +1,11 @@ +--- nut-2.4.1.orig/ltmain.sh 2009-02-17 10:23:41.000000000 +0100 ++++ nut-2.4.1/ltmain.sh 2011-01-16 01:03:10.000000000 +0100 +@@ -4238,7 +4238,7 @@ func_mode_link () + # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC + # @file GCC response files + -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) + func_quote_for_eval "$arg" + arg="$func_quote_for_eval_result" + func_append compile_command " $arg" diff --git a/package/obexftp/patches/patch-ltmain_sh b/package/obexftp/patches/patch-ltmain_sh new file mode 100644 index 000000000..2f96170e4 --- /dev/null +++ b/package/obexftp/patches/patch-ltmain_sh @@ -0,0 +1,11 @@ +--- obexftp-0.23.orig/ltmain.sh 2008-02-08 01:54:46.000000000 +0100 ++++ obexftp-0.23/ltmain.sh 2011-01-16 13:40:07.000000000 +0100 +@@ -1676,7 +1676,7 @@ EOF + # -F/path gives path to uninstalled frameworks, gcc on darwin + # @file GCC response files + -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) + + # Unknown arguments in both finalize_command and compile_command need + # to be aesthetically quoted because they are evaled later. diff --git a/package/opencdk/patches/patch-build-aux_ltmain_sh b/package/opencdk/patches/patch-build-aux_ltmain_sh new file mode 100644 index 000000000..a47e789b4 --- /dev/null +++ b/package/opencdk/patches/patch-build-aux_ltmain_sh @@ -0,0 +1,11 @@ +--- opencdk-0.6.6.orig/build-aux/ltmain.sh 2006-03-11 19:49:04.000000000 +0100 ++++ opencdk-0.6.6/build-aux/ltmain.sh 2011-01-15 19:36:27.000000000 +0100 +@@ -1623,7 +1623,7 @@ EOF + # -pg pass through profiling flag for GCC + # @file GCC response files + -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*|-pg| \ +- -t[45]*|-txscale*|@*) ++ -t[45]*|-txscale*|@*|-fstack-protector*|-flto) + + # Unknown arguments in both finalize_command and compile_command need + # to be aesthetically quoted because they are evaled later. diff --git a/package/opencdk/patches/patch-configure b/package/opencdk/patches/patch-configure index 6fc79ec8d..8f21990e8 100644 --- a/package/opencdk/patches/patch-configure +++ b/package/opencdk/patches/patch-configure @@ -1,7 +1,7 @@ $Id$ ---- opencdk-0.6.4.orig/configure Mon Jun 11 10:25:19 2007 -+++ opencdk-0.6.4/configure Thu Sep 6 15:42:04 2007 -@@ -20379,8 +20379,8 @@ echo "$as_me: error: +--- opencdk-0.6.6.orig/configure 2007-11-13 13:32:19.000000000 +0100 ++++ opencdk-0.6.6/configure 2011-01-15 19:30:41.000000000 +0100 +@@ -20389,8 +20389,8 @@ echo "$as_me: error: diff --git a/package/opencdk/patches/patch-ltmain_sh b/package/opencdk/patches/patch-ltmain_sh new file mode 100644 index 000000000..213194a88 --- /dev/null +++ b/package/opencdk/patches/patch-ltmain_sh @@ -0,0 +1,11 @@ +--- opencdk-0.6.6.orig/ltmain.sh 2006-03-11 19:49:04.000000000 +0100 ++++ opencdk-0.6.6/ltmain.sh 2011-01-15 19:31:50.000000000 +0100 +@@ -1623,7 +1623,7 @@ EOF + # -pg pass through profiling flag for GCC + # @file GCC response files + -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*|-pg| \ +- -t[45]*|-txscale*|@*) ++ -t[45]*|-txscale*|@*|-fstack-protector*|-flto) + + # Unknown arguments in both finalize_command and compile_command need + # to be aesthetically quoted because they are evaled later. 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/openct/patches/patch-ltmain_sh b/package/openct/patches/patch-ltmain_sh new file mode 100644 index 000000000..54653d706 --- /dev/null +++ b/package/openct/patches/patch-ltmain_sh @@ -0,0 +1,11 @@ +--- openct-0.6.20.orig/ltmain.sh 2010-02-16 10:03:04.000000000 +0100 ++++ openct-0.6.20/ltmain.sh 2011-01-16 13:43:14.000000000 +0100 +@@ -4765,7 +4765,7 @@ func_mode_link () + # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC + # @file GCC response files + -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) + func_quote_for_eval "$arg" + arg="$func_quote_for_eval_result" + func_append compile_command " $arg" diff --git a/package/openldap/Makefile b/package/openldap/Makefile index 8b53713cb..937c32bc7 100644 --- a/package/openldap/Makefile +++ b/package/openldap/Makefile @@ -24,8 +24,8 @@ PKGSC_OPENLDAP_SLAPD:= net/misc DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tgz -PKG_FLAVOURS:= WITH_IPV6 -PKGFD_WITH_IPV6:= enable IPv6 support +PKG_FLAVOURS_OPENLDAP_SLAPD:= WITH_IPV6 +PKGFD_WITH_IPV6:= enable IPv6 support include ${TOPDIR}/mk/package.mk @@ -50,7 +50,7 @@ PKG_CONFIGURE_OPTIONS+= --enable-slapd \ --with-tls \ --with-yielding_select="yes" \ -ifneq (${ADK_PACKAGE_OPENLDAP_WITH_IPV6},) +ifneq (${ADK_PACKAGE_OPENLDAP_SLAPD_WITH_IPV6},) CONFIGURE_ARGS+= --enable-ipv6 else CONFIGURE_ARGS+= --disable-ipv6 diff --git a/package/openldap/patches/patch-build_ltmain_sh b/package/openldap/patches/patch-build_ltmain_sh new file mode 100644 index 000000000..5876849e1 --- /dev/null +++ b/package/openldap/patches/patch-build_ltmain_sh @@ -0,0 +1,11 @@ +--- openldap-2.4.23.orig/build/ltmain.sh 2010-04-13 22:22:21.000000000 +0200 ++++ openldap-2.4.23/build/ltmain.sh 2011-01-15 12:35:41.000000000 +0100 +@@ -1668,7 +1668,7 @@ EOF + # -pg pass through profiling flag for GCC + # @file GCC response files + -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*|-pg| \ +- -t[45]*|-txscale*|@*) ++ -t[45]*|-txscale*|@*|-fstack-protector*|-flto) + + # Unknown arguments in both finalize_command and compile_command need + # to be aesthetically quoted because they are evaled later. diff --git a/package/openobex/patches/patch-ltmain_sh b/package/openobex/patches/patch-ltmain_sh new file mode 100644 index 000000000..7772f428f --- /dev/null +++ b/package/openobex/patches/patch-ltmain_sh @@ -0,0 +1,11 @@ +--- openobex-1.5.orig/ltmain.sh 2008-08-30 00:29:24.000000000 +0200 ++++ openobex-1.5/ltmain.sh 2011-01-16 01:11:57.000000000 +0100 +@@ -1676,7 +1676,7 @@ EOF + # -F/path gives path to uninstalled frameworks, gcc on darwin + # @file GCC response files + -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) + + # Unknown arguments in both finalize_command and compile_command need + # to be aesthetically quoted because they are evaled later. 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..7797c4fcc --- /dev/null +++ b/package/opensc/patches/patch-ltmain_sh @@ -0,0 +1,39 @@ +--- opensc-0.11.13.orig/ltmain.sh 2011-01-16 13:51:11.000000000 +0100 ++++ opensc-0.11.13/ltmain.sh 2011-01-16 13:46:22.000000000 +0100 +@@ -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*|@*|-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" +@@ -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..fb876c330 100644 --- a/package/openssh/Makefile +++ b/package/openssh/Makefile @@ -21,14 +21,14 @@ PKGSD_OPENSSH_CLIENT_UTILS:= OpenSSH client utilities PKGSD_OPENSSH_SFTP_CLIENT:= OpenSSH sftp client PKGSD_OPENSSH_SFTP_SERVER:= OpenSSH sftp server -PKG_CHOICES:= NOKRB WITH_KRB5 WITH_HEIMDAL -PKGCD_NOKRB:= no Kerberos support -PKGCD_WITH_KRB5:= with MIT Kerberos -PKGCS_WITH_KRB5:= libkrb5 libcom-err -PKGCB_WITH_KRB5:= krb5 -PKGCD_WITH_HEIMDAL:= with Heimdal Kerberos -PKGCS_WITH_HEIMDAL:= libheimdal libcom-err -PKGCB_WITH_HEIMDAL:= heimdal +PKG_CHOICES_OPENSSH_SERVER:= NOKRB WITH_KRB5 WITH_HEIMDAL +PKGCD_NOKRB:= no Kerberos support +PKGCD_WITH_KRB5:= with MIT Kerberos +PKGCS_WITH_KRB5:= libkrb5 libcom-err +PKGCB_WITH_KRB5:= krb5 +PKGCD_WITH_HEIMDAL:= with Heimdal Kerberos +PKGCS_WITH_HEIMDAL:= libheimdal libcom-err +PKGCB_WITH_HEIMDAL:= heimdal include ${TOPDIR}/mk/package.mk @@ -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-pkcs11/patches/patch-ltmain_sh b/package/openssl-pkcs11/patches/patch-ltmain_sh new file mode 100644 index 000000000..317a0b26c --- /dev/null +++ b/package/openssl-pkcs11/patches/patch-ltmain_sh @@ -0,0 +1,11 @@ +--- engine_pkcs11-0.1.8.orig/ltmain.sh 2010-01-07 11:21:35.000000000 +0100 ++++ engine_pkcs11-0.1.8/ltmain.sh 2011-01-16 13:57:19.000000000 +0100 +@@ -4765,7 +4765,7 @@ func_mode_link () + # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC + # @file GCC response files + -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) + func_quote_for_eval "$arg" + arg="$func_quote_for_eval_result" + func_append compile_command " $arg" diff --git a/package/openssl/Makefile b/package/openssl/Makefile index f0fdc50fb..472362adc 100644 --- a/package/openssl/Makefile +++ b/package/openssl/Makefile @@ -22,9 +22,8 @@ PKGSD_LIBOPENSSL_DEV:= development files for openssl PKGSC_LIBOPENSSL_DEV:= devel PKGSS_LIBOPENSSL_DEV:= libopenssl -PKG_FLAVOURS:= WITH_EC -PKGFD_WITH_EC:= enable Elliptic Curve crypto -PKGSUB_WITH_EC:= libopenssl +PKG_FLAVOURS_LIBOPENSSL:= WITH_EC +PKGFD_WITH_EC:= enable Elliptic Curve crypto include ${TOPDIR}/mk/package.mk @@ -32,10 +31,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 @@ -44,7 +39,7 @@ FAKE_FLAGS+= INSTALL_PREFIX=${WRKINST} OPENSSL_OPTIONS:= shared no-err no-krb5 no-threads zlib-dynamic no-engines no-camellia no-idea no-rc5 no-mdc2 no-sha0 no-smime no-aes192 no-ripemd no-cast -ifeq ($(ADK_PACKAGE_OPENSSL_WITH_EC),) +ifeq ($(ADK_PACKAGE_LIBOPENSSL_WITH_EC),) OPENSSL_OPTIONS+= no-ec endif @@ -74,10 +69,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..5c9c8dc6e 100644 --- a/package/openvpn/Makefile +++ b/package/openvpn/Makefile @@ -15,7 +15,7 @@ PKG_URL:= http://openvpn.net/ PKG_SITES:= http://openvpn.net/release/ PKG_SUBPKGS:= OPENVPN OPENVPN_EASY_RSA -PKG_FLAVOURS:= WITH_LZO WITH_MANAGEMENT WITH_HTTPPROXY WITH_SOCKS +PKG_FLAVOURS_OPENVPN:= WITH_LZO WITH_MANAGEMENT WITH_HTTPPROXY WITH_SOCKS PKGFD_WITH_LZO:= enable LZO compression support PKGFS_WITH_LZO:= liblzo PKGFB_WITH_LZO:= liblzo @@ -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/oprofile/patches/patch-doc_oprofile_1 b/package/oprofile/patches/patch-doc_oprofile_1 deleted file mode 100644 index 2694725cd..000000000 --- a/package/oprofile/patches/patch-doc_oprofile_1 +++ /dev/null @@ -1,26 +0,0 @@ ---- oprofile-0.9.6.orig/doc/oprofile.1 2009-11-24 16:26:33.000000000 +0100 -+++ oprofile-0.9.6/doc/oprofile.1 2010-07-13 17:55:07.343074887 +0200 -@@ -1,4 +1,4 @@ --.TH OPROFILE 1 "Tue 24 November 2009" "oprofile 0.9.6" -+.TH OPROFILE 1 "Tue 13 July 2010" "oprofile 0.9.6" - .UC 4 - .SH NAME - oprofile \- a system-wide profiler -@@ -153,7 +153,7 @@ Configuration files - .I /root/.oprofile/daemonrc - Configuration file for opcontrol - .TP --.I /usr/local/share/oprofile/ -+.I /usr/share/oprofile/ - Event description files used by OProfile. - .TP - .I /var/lib/oprofile/samples/oprofiled.log -@@ -173,7 +173,7 @@ The location of the generated sample fil - This man page is current for oprofile-0.9.6. - - .SH SEE ALSO --.BR /usr/local/share/doc/oprofile/, -+.BR /usr/share/doc/oprofile/, - .BR opcontrol(1), - .BR opreport(1), - .BR opannotate(1), diff --git a/package/oprofile/patches/patch-ltmain_sh b/package/oprofile/patches/patch-ltmain_sh new file mode 100644 index 000000000..734d4fee0 --- /dev/null +++ b/package/oprofile/patches/patch-ltmain_sh @@ -0,0 +1,11 @@ +--- oprofile-0.9.6.orig/ltmain.sh 2008-10-01 16:41:58.000000000 +0200 ++++ oprofile-0.9.6/ltmain.sh 2011-01-16 14:01:51.000000000 +0100 +@@ -1676,7 +1676,7 @@ EOF + # -F/path gives path to uninstalled frameworks, gcc on darwin + # @file GCC response files + -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) + + # Unknown arguments in both finalize_command and compile_command need + # to be aesthetically quoted because they are evaled later. diff --git a/package/osiris/patches/patch-configure b/package/osiris/patches/patch-configure index 7d0b90b3f..b9ae74fe0 100644 --- a/package/osiris/patches/patch-configure +++ b/package/osiris/patches/patch-configure @@ -1,7 +1,13 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $ --- osiris-4.2.3.orig/configure 2006-07-28 01:57:51.000000000 +0200 -+++ osiris-4.2.3/configure 2009-12-11 21:26:32.000000000 +0100 -@@ -3403,7 +3403,7 @@ else ++++ osiris-4.2.3/configure 2011-01-16 15:16:06.000000000 +0100 +@@ -1,4 +1,5 @@ + #! /bin/sh ++set -x + # Guess values for system-dependent variables and create Makefiles. + # Generated by GNU Autoconf 2.59. + # +@@ -3403,7 +3404,7 @@ else fi @@ -10,7 +16,80 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $ AUTOHEADER=echo if test "x$prefix" = "xNONE" ; then -@@ -3738,7 +3738,7 @@ CYGWIN*) +@@ -3573,7 +3574,6 @@ else + + for ssldir in $tryssldir "" /usr/local/openssl /usr/lib/openssl /usr/local/ssl /usr/lib/ssl /usr/local /usr/pkg /opt /opt/openssl ; do + CPPFLAGS="$saved_CPPFLAGS" +- LDFLAGS="$saved_LDFLAGS" + + # GOD DAMN FUCKING STATIC BINARIES ON SOLARIS CAN EAT MY ASS. + +@@ -3596,29 +3596,6 @@ else + if test ! -z "$ssldir" -a ! -d "$ssldir" ; then + continue; + fi +- if test ! -z "$ssldir" -a "x$ssldir" != "x/usr"; then +- # Try to use $ssldir/lib if it exists, otherwise +- # $ssldir +- if test -d "$ssldir/lib" ; then +- LDFLAGS="-L$ssldir/lib $saved_LDFLAGS" +- if test ! -z "$need_dash_r" ; then +- LDFLAGS="-R$ssldir/lib $LDFLAGS" +- fi +- else +- LDFLAGS="-L$ssldir $saved_LDFLAGS" +- if test ! -z "$need_dash_r" ; then +- LDFLAGS="-R$ssldir $LDFLAGS" +- fi +- fi +- +- # Try to use $ssldir/include if it exists, otherwise +- # $ssldir +- if test -d "$ssldir/include" ; then +- CPPFLAGS="-I$ssldir/include $saved_CPPFLAGS" +- else +- CPPFLAGS="-I$ssldir $saved_CPPFLAGS" +- fi +- fi + + # Basic test to check for compatible version and correct linking + +@@ -3694,34 +3671,6 @@ fi + echo "$as_me:$LINENO: result: $ac_cv_openssldir" >&5 + echo "${ECHO_T}$ac_cv_openssldir" >&6 + +-if (test ! -z "$ac_cv_openssldir" && test "x$ac_cv_openssldir" != "x(system)") ; then +-# AC_DEFINE(HAVE_OPENSSL) +- ssldir=$ac_cv_openssldir +- if test ! -z "$ssldir" -a "x$ssldir" != "x/usr"; then +- # Try to use $ssldir/lib if it exists, otherwise +- # $ssldir +- if test -d "$ssldir/lib" ; then +- LDFLAGS="-L$ssldir/lib $saved_LDFLAGS" +- if test ! -z "$need_dash_r" ; then +- LDFLAGS="-R$ssldir/lib $LDFLAGS" +- fi +- else +- LDFLAGS="-L$ssldir $saved_LDFLAGS" +- if test ! -z "$need_dash_r" ; then +- LDFLAGS="-R$ssldir $LDFLAGS" +- fi +- fi +- # Try to use $ssldir/include if it exists, otherwise +- # $ssldir +- if test -d "$ssldir/include" ; then +- CPPFLAGS="-I$ssldir/include $saved_CPPFLAGS" +- else +- CPPFLAGS="-I$ssldir $saved_CPPFLAGS" +- fi +- fi +-fi +- +- + case "$OS_NAME" in + SunOS*) + LIBS="$saved_LIBS $ssldir/lib/libssl.a $ssldir/lib/libcrypto.a" +@@ -3738,7 +3687,7 @@ CYGWIN*) esac @@ -19,7 +98,7 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $ case "${OS_NAME}" in MINGW32*) -@@ -4448,11 +4448,6 @@ cat >>confdefs.h <<_ACEOF +@@ -4448,11 +4397,6 @@ cat >>confdefs.h <<_ACEOF #define SYSTEM_LINUX 1 _ACEOF @@ -31,7 +110,7 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $ ;; BSD*) -@@ -11394,7 +11389,6 @@ chmod ug+x src/install/install.sh +@@ -11394,7 +11338,6 @@ chmod ug+x src/install/install.sh echo " Osiris MD Directory: ${with_md_root_dir}" echo " Osiris MD user: ${with_osiris_md_user}" echo " Osiris MD config dir: ${with_md_conf_dir}" diff --git a/package/osiris/patches/patch-src_db-4_2_52_dist_configure b/package/osiris/patches/patch-src_db-4_2_52_dist_configure new file mode 100644 index 000000000..45c04bec4 --- /dev/null +++ b/package/osiris/patches/patch-src_db-4_2_52_dist_configure @@ -0,0 +1,12 @@ +--- osiris-4.2.3.orig/src/db-4.2.52/dist/configure 2006-07-28 01:57:51.000000000 +0200 ++++ osiris-4.2.3/src/db-4.2.52/dist/configure 2011-01-16 14:41:34.000000000 +0100 +@@ -3498,7 +3498,8 @@ freebsd*) + LDFLAGS="$LDFLAGS -pthread";; + gnu*|k*bsd*-gnu|linux*) + optimize_def="-O2" +- CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE -D_REENTRANT";; ++ CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE -D_REENTRANT" ++ LDFLAGS="$LDFLAGS -pthread";; + hpux*) CPPFLAGS="$CPPFLAGS -D_REENTRANT";; + irix*) optimize_def="-O2" + CPPFLAGS="$CPPFLAGS -D_SGI_MP_SOURCE";; diff --git a/package/osiris/patches/patch-src_db-4_2_52_dist_ltmain_sh b/package/osiris/patches/patch-src_db-4_2_52_dist_ltmain_sh new file mode 100644 index 000000000..8b9084264 --- /dev/null +++ b/package/osiris/patches/patch-src_db-4_2_52_dist_ltmain_sh @@ -0,0 +1,11 @@ +--- osiris-4.2.3.orig/src/db-4.2.52/dist/ltmain.sh 2006-07-28 01:57:51.000000000 +0200 ++++ osiris-4.2.3/src/db-4.2.52/dist/ltmain.sh 2011-01-16 14:08:34.000000000 +0100 +@@ -1298,7 +1298,7 @@ EOF + # but this is not reliable with gcc because gcc may use -mfoo to + # select a different linker, different libraries, etc, while + # -Wl,-mfoo simply passes -mfoo to the linker. +- -m*) ++ -m*|-fstack-protector*|-flto) + # Unknown arguments in both finalize_command and compile_command need + # to be aesthetically quoted because they are evaled later. + arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"` diff --git a/package/owfs/patches/autotool.patch b/package/owfs/patches/autotool.patch index 12a4fe090..66bb2e93b 100644 --- a/package/owfs/patches/autotool.patch +++ b/package/owfs/patches/autotool.patch @@ -56822,7 +56822,7 @@ diff -Nur owfs-2.7p38.orig/src/scripts/install/ltmain.sh owfs-2.7p38/src/scripts + # -tp=* Portland pgcc target processor selection -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*|@*|-tp=*) ++ -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|-fstack-protector*|-flto) func_quote_for_eval "$arg" arg="$func_quote_for_eval_result" func_append compile_command " $arg" diff --git a/package/pango/patches/patch-ltmain_sh b/package/pango/patches/patch-ltmain_sh new file mode 100644 index 000000000..79b73df6f --- /dev/null +++ b/package/pango/patches/patch-ltmain_sh @@ -0,0 +1,11 @@ +--- pango-1.28.3.orig/ltmain.sh 2010-09-29 13:02:28.000000000 +0200 ++++ pango-1.28.3/ltmain.sh 2011-01-14 23:41:25.000000000 +0100 +@@ -4765,7 +4765,7 @@ func_mode_link () + # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC + # @file GCC response files + -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) + func_quote_for_eval "$arg" + arg="$func_quote_for_eval_result" + func_append compile_command " $arg" diff --git a/package/pango/patches/patch-tests_runtests_sh b/package/pango/patches/patch-tests_runtests_sh new file mode 100644 index 000000000..c4675af7a --- /dev/null +++ b/package/pango/patches/patch-tests_runtests_sh @@ -0,0 +1,8 @@ +--- pango-1.28.3.orig/tests/runtests.sh 2010-09-29 13:02:41.000000000 +0200 ++++ pango-1.28.3/tests/runtests.sh 2011-01-14 23:40:32.000000000 +0100 +@@ -1,4 +1,4 @@ +-#! /bin/sh ++#! /bin/bash + + LOGFILE=runtests.log + POTENTIAL_TESTS='testboundaries testcolor testboundaries_ucd' diff --git a/package/parted/patches/patch-build-aux_ltmain_sh b/package/parted/patches/patch-build-aux_ltmain_sh new file mode 100644 index 000000000..bb54e7146 --- /dev/null +++ b/package/parted/patches/patch-build-aux_ltmain_sh @@ -0,0 +1,11 @@ +--- parted-2.3.orig/build-aux/ltmain.sh 2010-05-28 20:29:02.000000000 +0200 ++++ parted-2.3/build-aux/ltmain.sh 2011-01-16 15:30:44.000000000 +0100 +@@ -4971,7 +4971,7 @@ func_mode_link () + # @file GCC response files + # -tp=* Portland pgcc target processor selection + -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \ +- -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*) ++ -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|-fstack-protector*|-flto) + func_quote_for_eval "$arg" + arg="$func_quote_for_eval_result" + func_append compile_command " $arg" diff --git a/package/pciutils/Makefile b/package/pciutils/Makefile index 2e21cd918..e1176564d 100644 --- a/package/pciutils/Makefile +++ b/package/pciutils/Makefile @@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= pciutils PKG_VERSION:= 3.1.7 -PKG_RELEASE:= 1 +PKG_RELEASE:= 2 PKG_MD5SUM:= f3e349d22a3714b4272b171649ad5235 PKG_DESCR:= PCI Utilities PKG_SECTION:= utils @@ -14,8 +14,6 @@ PKG_BUILDDEP:= zlib PKG_URL:= http://www.kernel.org/pub/software/utils/pciutils/ PKG_SITES:= http://www.kernel.org/pub/software/utils/pciutils/ -PKG_HOST_DEPENDS:= !darwin - include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,PCIUTILS,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) @@ -24,7 +22,8 @@ CONFIG_STYLE:= manual INSTALL_STYLE:= manual MAKE_FLAGS+= CC="${TARGET_CC}" \ - CFLAGS="${TCFLAGS}" \ + CFLAGS="${TARGET_CFLAGS}" \ + CROSS_COMPILE="${TARGET_CROSS}" \ IDSDIR="/usr/share" \ HOST=${GNU_TARGET_NAME} ALL_TARGET:= diff --git a/package/pcre/patches/patch-ltmain_sh b/package/pcre/patches/patch-ltmain_sh new file mode 100644 index 000000000..b655e96af --- /dev/null +++ b/package/pcre/patches/patch-ltmain_sh @@ -0,0 +1,11 @@ +--- pcre-8.02.orig/ltmain.sh 2010-03-19 11:21:04.000000000 +0100 ++++ pcre-8.02/ltmain.sh 2011-01-14 21:12:27.000000000 +0100 +@@ -4765,7 +4765,7 @@ func_mode_link () + # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC + # @file GCC response files + -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) + func_quote_for_eval "$arg" + arg="$func_quote_for_eval_result" + func_append compile_command " $arg" 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-ltmain_sh b/package/pcsc-lite/patches/patch-ltmain_sh new file mode 100644 index 000000000..62af43733 --- /dev/null +++ b/package/pcsc-lite/patches/patch-ltmain_sh @@ -0,0 +1,11 @@ +--- pcsc-lite-1.6.6.orig/ltmain.sh 2010-12-12 11:08:23.000000000 +0100 ++++ pcsc-lite-1.6.6/ltmain.sh 2011-01-14 20:20:39.000000000 +0100 +@@ -4765,7 +4765,7 @@ func_mode_link () + # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC + # @file GCC response files + -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) + func_quote_for_eval "$arg" + arg="$func_quote_for_eval_result" + func_append compile_command " $arg" 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/pdnsd/Makefile b/package/pdnsd/Makefile index a6f8041aa..8e83586b3 100644 --- a/package/pdnsd/Makefile +++ b/package/pdnsd/Makefile @@ -13,7 +13,7 @@ PKG_DEPENDS:= libpthread PKG_URL:= http://www.phys.uu.nl/~rombouts/pdnsd.html PKG_SITES:= http://www.phys.uu.nl/~rombouts/pdnsd/releases/ -PKG_FLAVOURS:= WITH_IPV6 +PKG_FLAVOURS_PDNSD:= WITH_IPV6 PKGFD_WITH_IPV6:= enable IPv6 support PKG_HOST_DEPENDS:= !netbsd diff --git a/package/pipacs/Makefile b/package/pipacs/Makefile index 612771db5..81d4176e9 100644 --- a/package/pipacs/Makefile +++ b/package/pipacs/Makefile @@ -4,6 +4,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= pipacs +PKG_VERSION:= 0.1 PKG_RELEASE:= 2 PKG_DESCR:= an UNIX socket accounting/wiewer program PKG_SECTION:= net/misc @@ -17,9 +18,6 @@ $(eval $(call PKG_template,PIPACS,${PKG_NAME},${PKG_RELEASE},${PKG_DEPENDS},${PK CONFIG_STYLE:= manual INSTALL_STYLE:= manual -MAKE_FLAGS+= CFLAGS="${TCFLAGS} ${TCPPFLAGS}" \ - ${TARGET_CONFIGURE_OPTS} - do-install: ${INSTALL_DIR} ${IDIR_PIPACS}/usr/bin ${INSTALL_BIN} ${WRKBUILD}/pipacs ${IDIR_PIPACS}/usr/bin diff --git a/package/pipacs/src/Makefile b/package/pipacs/src/Makefile index 3a48e88f7..c3f830be6 100644 --- a/package/pipacs/src/Makefile +++ b/package/pipacs/src/Makefile @@ -1,14 +1,16 @@ - +CPPFLAGS?= +CFLAGS?= +LDFLAGS?= EXTRA_CFLAGS := -c -I. PIPACS_OBJS := pipacs.o parser.o all: pipacs %.o: %.c - $(CC) $(CFLAGS) $(EXTRA_CFLAGS) -o $@ $^ + $(CC) $(CPPFLAGS) $(CFLAGS) $(EXTRA_CFLAGS) -o $@ $^ pipacs: $(PIPACS_OBJS) - $(CC) -o $@ $^ + $(CC) $(LDFLAGS) -o $@ $^ clean: rm -f *.o *.so pipacs diff --git a/package/pixman/patches/patch-ltmain_sh b/package/pixman/patches/patch-ltmain_sh new file mode 100644 index 000000000..b38645c65 --- /dev/null +++ b/package/pixman/patches/patch-ltmain_sh @@ -0,0 +1,11 @@ +--- pixman-0.16.2.orig/ltmain.sh 2009-04-23 02:27:43.000000000 +0200 ++++ pixman-0.16.2/ltmain.sh 2011-01-14 20:10:48.000000000 +0100 +@@ -4765,7 +4765,7 @@ func_mode_link () + # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC + # @file GCC response files + -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) + func_quote_for_eval "$arg" + arg="$func_quote_for_eval_result" + func_append compile_command " $arg" diff --git a/package/ppp/Makefile b/package/ppp/Makefile index 591f3ca2a..85386cb08 100644 --- a/package/ppp/Makefile +++ b/package/ppp/Makefile @@ -31,23 +31,11 @@ $(eval $(call PKG_template,PPP_MOD_PPPSTATS,ppp-mod-pppstats,${PKG_VERSION}-${PK $(eval $(call PKG_template,PPP_MOD_PPPUMTS,ppp-mod-pppumts,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS_UMTS},${PKG_DESCR},${PKG_SECTION})) CONFIGURE_ENV+= UNAME_S="Linux" -XAKE_FLAGS+= CC="${TARGET_CC}" \ - COPTS="${TCFLAGS}" \ - STAGING_TARGET_DIR=${STAGING_TARGET_DIR} \ +XAKE_FLAGS+= STAGING_TARGET_DIR=${STAGING_TARGET_DIR} \ 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/ @@ -65,11 +53,13 @@ post-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y} ${INSTALL_BIN} ./files/pon ${IDIR_PPP}/usr/sbin/ ${INSTALL_BIN} ./files/poff ${IDIR_PPP}/usr/sbin/ ${INSTALL_DIR} ${IDIR_PPP}/etc/ppp/peers +ifeq (${ADK_INSTALL_PACKAGE_NETWORK_SCRIPTS},y) $(INSTALL_DIR) ${IDIR_PPP}/etc/network/if-pre-up.d $(INSTALL_BIN) ./files/ppp.pre-up \ ${IDIR_PPP}/etc/network/if-pre-up.d/05-ppp +endif -mod-radius-install: +ppp-mod-radius-install: ${INSTALL_DIR} ${IDIR_PPP_MOD_RADIUS}/etc/radiusclient ${CP} ${WRKBUILD}/pppd/plugins/radius/etc/* \ ${IDIR_PPP_MOD_RADIUS}/etc/radiusclient @@ -78,7 +68,7 @@ mod-radius-install: ${INSTALL_BIN} $(WRKINST)/usr/lib/pppd/$(PKG_VERSION)/radius.so \ ${IDIR_PPP_MOD_RADIUS}/usr/lib/pppd/$(PKG_VERSION) -mod-pppoe-install: +ppp-mod-pppoe-install: ${INSTALL_DIR} ${IDIR_PPP_MOD_PPPOE}/usr/lib/pppd/$(PKG_VERSION) ${INSTALL_BIN} $(WRKINST)/usr/lib/pppd/$(PKG_VERSION)/rp-pppoe.so \ ${IDIR_PPP_MOD_PPPOE}/usr/lib/pppd/$(PKG_VERSION) @@ -86,7 +76,7 @@ mod-pppoe-install: ${INSTALL_DATA} ./files/etc/ppp/templates/pppoe \ ${IDIR_PPP_MOD_PPPOE}/etc/ppp/templates/ -mod-pppoa-install: +ppp-mod-pppoa-install: ${INSTALL_DIR} ${IDIR_PPP_MOD_PPPOA}/usr/lib/pppd/$(PKG_VERSION) ${INSTALL_BIN} $(WRKINST)/usr/lib/pppd/$(PKG_VERSION)/pppoatm.so \ ${IDIR_PPP_MOD_PPPOA}/usr/lib/pppd/$(PKG_VERSION) @@ -94,27 +84,29 @@ mod-pppoa-install: ${INSTALL_DATA} ./files/etc/ppp/templates/pppoa \ ${IDIR_PPP_MOD_PPPOA}/etc/ppp/templates/ -mod-chat-install: +ppp-mod-chat-install: ${INSTALL_DIR} ${IDIR_PPP_MOD_CHAT}/usr/sbin ${CP} ${WRKINST}/usr/sbin/chat ${IDIR_PPP_MOD_CHAT}/usr/sbin/ -mod-pppdump-install: +ppp-mod-pppdump-install: ${INSTALL_DIR} ${IDIR_PPP_MOD_PPPDUMP}/usr/sbin ${CP} ${WRKINST}/usr/sbin/pppdump ${IDIR_PPP_MOD_PPPDUMP}/usr/sbin/ -mod-pppstats-install: +ppp-mod-pppstats-install: ${INSTALL_DIR} ${IDIR_PPP_MOD_PPPSTATS}/usr/sbin ${CP} ${WRKINST}/usr/sbin/pppstats ${IDIR_PPP_MOD_PPPSTATS}/usr/sbin/ -mod-pppumts-install: +ppp-mod-pppumts-install: ${INSTALL_DIR} ${IDIR_PPP_MOD_PPPUMTS}/etc/ppp/templates ${INSTALL_DATA} ./files/etc/ppp/templates/umts \ ${IDIR_PPP_MOD_PPPUMTS}/etc/ppp/templates/ +ifeq (${ADK_INSTALL_PACKAGE_NETWORK_SCRIPTS},y) $(INSTALL_DIR) ${IDIR_PPP_MOD_PPPUMTS}/etc/network/if-pre-up.d $(INSTALL_DIR) ${IDIR_PPP_MOD_PPPUMTS}/etc/network/if-post-down.d $(INSTALL_BIN) ./files/hso.if-up \ ${IDIR_PPP_MOD_PPPUMTS}/etc/network/if-pre-up.d/06-hso $(INSTALL_BIN) ./files/hso.if-down \ ${IDIR_PPP_MOD_PPPUMTS}/etc/network/if-post-down.d/06-hso +endif include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/ppp/patches/patch-chat_Makefile_linux b/package/ppp/patches/patch-chat_Makefile_linux index 63190f3e3..3d0c3fdff 100644 --- a/package/ppp/patches/patch-chat_Makefile_linux +++ b/package/ppp/patches/patch-chat_Makefile_linux @@ -1,6 +1,26 @@ ---- ppp-2.4.4.orig/chat/Makefile.linux 2006-06-04 07:07:46.000000000 +0200 -+++ ppp-2.4.4/chat/Makefile.linux 2009-06-05 19:12:00.000000000 +0200 -@@ -25,7 +25,7 @@ chat.o: chat.c +--- ppp-2.4.5.orig/chat/Makefile.linux 2009-11-16 23:26:07.000000000 +0100 ++++ ppp-2.4.5/chat/Makefile.linux 2011-01-16 15:56:59.000000000 +0100 +@@ -10,22 +10,23 @@ CDEF3= -UNO_SLEEP # Use the usleep fun + CDEF4= -DFNDELAY=O_NDELAY # Old name value + CDEFS= $(CDEF1) $(CDEF2) $(CDEF3) $(CDEF4) + +-COPTS= -O2 -g -pipe +-CFLAGS= $(COPTS) $(CDEFS) ++CPPFLAGS?= ++CFLAGS?=-O2 -g -pipe ++LDFLAGS?= + + INSTALL= install + + all: chat + + chat: chat.o +- $(CC) -o chat chat.o ++ $(CC) $(LDFLAGS) -o chat chat.o + + chat.o: chat.c +- $(CC) -c $(CFLAGS) -o chat.o chat.c ++ $(CC) -c $(CPPFLAGS) $(CFLAGS) -o chat.o chat.c install: chat mkdir -p $(BINDIR) $(MANDIR) diff --git a/package/ppp/patches/patch-include_linux_ppp-comp_h b/package/ppp/patches/patch-include_linux_ppp-comp_h deleted file mode 100644 index 4ffaea45c..000000000 --- a/package/ppp/patches/patch-include_linux_ppp-comp_h +++ /dev/null @@ -1,63 +0,0 @@ ---- ppp-2.4.4.orig/include/linux/ppp-comp.h 2002-12-06 10:49:15.000000000 +0100 -+++ ppp-2.4.4/include/linux/ppp-comp.h 2009-06-05 19:12:00.000000000 +0200 -@@ -36,7 +36,7 @@ - */ - - /* -- * ==FILEVERSION 20020319== -+ * ==FILEVERSION 20020715== - * - * NOTE TO MAINTAINERS: - * If you modify this file at all, please set the above date. -@@ -86,7 +86,7 @@ struct compressor { - - /* Compress a packet */ - int (*compress) (void *state, unsigned char *rptr, -- unsigned char *obuf, int isize, int osize); -+ unsigned char *obuf, int isize, int osize); - - /* Return compression statistics */ - void (*comp_stat) (void *state, struct compstat *stats); -@@ -107,7 +107,7 @@ struct compressor { - - /* Decompress a packet. */ - int (*decompress) (void *state, unsigned char *ibuf, int isize, -- unsigned char *obuf, int osize); -+ unsigned char *obuf, int osize); - - /* Update state for an incompressible packet received */ - void (*incomp) (void *state, unsigned char *ibuf, int icnt); -@@ -288,6 +288,33 @@ struct compressor { - opts |= MPPE_OPT_UNKNOWN; \ - } while (/* CONSTCOND */ 0) - -+/* MPPE/MPPC definitions by J.D.*/ -+#define MPPE_STATELESS MPPE_H_BIT /* configuration bit H */ -+#define MPPE_40BIT MPPE_L_BIT /* configuration bit L */ -+#define MPPE_56BIT MPPE_M_BIT /* configuration bit M */ -+#define MPPE_128BIT MPPE_S_BIT /* configuration bit S */ -+#define MPPE_MPPC MPPE_C_BIT /* configuration bit C */ -+ -+/* -+ * Definitions for Stac LZS. -+ */ -+ -+#define CI_LZS 17 /* config option for Stac LZS */ -+#define CILEN_LZS 5 /* length of config option */ -+ -+#define LZS_OVHD 4 /* max. LZS overhead */ -+#define LZS_HIST_LEN 2048 /* LZS history size */ -+#define LZS_MAX_CCOUNT 0x0FFF /* max. coherency counter value */ -+ -+#define LZS_MODE_NONE 0 -+#define LZS_MODE_LCB 1 -+#define LZS_MODE_CRC 2 -+#define LZS_MODE_SEQ 3 -+#define LZS_MODE_EXT 4 -+ -+#define LZS_EXT_BIT_FLUSHED 0x80 /* bit A */ -+#define LZS_EXT_BIT_COMP 0x20 /* bit C */ -+ - /* - * Definitions for other, as yet unsupported, compression methods. - */ diff --git a/package/ppp/patches/patch-include_net_ppp-comp_h b/package/ppp/patches/patch-include_net_ppp-comp_h deleted file mode 100644 index 239cf1443..000000000 --- a/package/ppp/patches/patch-include_net_ppp-comp_h +++ /dev/null @@ -1,36 +0,0 @@ ---- ppp-2.4.4.orig/include/net/ppp-comp.h 2002-12-06 10:49:15.000000000 +0100 -+++ ppp-2.4.4/include/net/ppp-comp.h 2009-06-05 19:12:00.000000000 +0200 -@@ -255,6 +255,33 @@ struct compressor { - opts |= MPPE_OPT_UNKNOWN; \ - } while (/* CONSTCOND */ 0) - -+/* MPPE/MPPC definitions by J.D.*/ -+#define MPPE_STATELESS MPPE_H_BIT /* configuration bit H */ -+#define MPPE_40BIT MPPE_L_BIT /* configuration bit L */ -+#define MPPE_56BIT MPPE_M_BIT /* configuration bit M */ -+#define MPPE_128BIT MPPE_S_BIT /* configuration bit S */ -+#define MPPE_MPPC MPPE_C_BIT /* configuration bit C */ -+ -+/* -+ * Definitions for Stac LZS. -+ */ -+ -+#define CI_LZS 17 /* config option for Stac LZS */ -+#define CILEN_LZS 5 /* length of config option */ -+ -+#define LZS_OVHD 4 /* max. LZS overhead */ -+#define LZS_HIST_LEN 2048 /* LZS history size */ -+#define LZS_MAX_CCOUNT 0x0FFF /* max. coherency counter value */ -+ -+#define LZS_MODE_NONE 0 -+#define LZS_MODE_LCB 1 -+#define LZS_MODE_CRC 2 -+#define LZS_MODE_SEQ 3 -+#define LZS_MODE_EXT 4 -+ -+#define LZS_EXT_BIT_FLUSHED 0x80 /* bit A */ -+#define LZS_EXT_BIT_COMP 0x20 /* bit C */ -+ - /* - * Definitions for other, as yet unsupported, compression methods. - */ diff --git a/package/ppp/patches/patch-pppd_Makefile_linux b/package/ppp/patches/patch-pppd_Makefile_linux index 32453b249..a447ae1ea 100644 --- a/package/ppp/patches/patch-pppd_Makefile_linux +++ b/package/ppp/patches/patch-pppd_Makefile_linux @@ -1,6 +1,31 @@ ---- ppp-2.4.4.orig/pppd/Makefile.linux 2006-06-04 07:07:46.000000000 +0200 -+++ ppp-2.4.4/pppd/Makefile.linux 2009-06-05 19:12:00.000000000 +0200 -@@ -48,7 +48,7 @@ MPPE=y +--- ppp-2.4.5.orig/pppd/Makefile.linux 2009-11-16 23:26:07.000000000 +0100 ++++ ppp-2.4.5/pppd/Makefile.linux 2011-01-16 17:09:40.000000000 +0100 +@@ -2,12 +2,7 @@ + # pppd makefile for Linux + # $Id: Makefile.linux,v 1.70 2007/06/19 02:08:34 carlsonj Exp $ + # +- +-# Default installation locations +-DESTDIR = $(INSTROOT)@DESTDIR@ +-BINDIR = $(DESTDIR)/sbin +-MANDIR = $(DESTDIR)/share/man/man8 +-INCDIR = $(DESTDIR)/include ++include ../makedefs.linux + + TARGETS = pppd + +@@ -30,10 +25,6 @@ ifeq (.depend,$(wildcard .depend)) + include .depend + endif + +-# CC = gcc +-# +-COPTS = -O2 -pipe -Wall -g +-LIBS = + + # Uncomment the next 2 lines to include support for Microsoft's + # MS-CHAP authentication protocol. Also, edit plugins/radius/Makefile.linux. +@@ -48,7 +39,7 @@ MPPE=y # Uncomment the next line to include support for PPP packet filtering. # This requires that the libpcap library and headers be installed # and that the kernel driver support PPP packet filtering. @@ -9,7 +34,7 @@ # Uncomment the next line to enable multilink PPP (enabled by default) # Linux distributions: Please leave multilink ENABLED in your builds -@@ -58,9 +58,9 @@ HAVE_MULTILINK=y +@@ -58,9 +49,9 @@ HAVE_MULTILINK=y # Uncomment the next line to enable the TDB database (enabled by default.) # If you enable multilink, then TDB is automatically enabled also. # Linux distributions: Please leave TDB ENABLED in your builds. @@ -21,16 +46,22 @@ #USE_PAM=y #HAVE_INET6=y -@@ -77,7 +77,7 @@ MAXOCTETS=y +@@ -75,11 +66,10 @@ PLUGIN=y - INCLUDE_DIRS= -I../include + MAXOCTETS=y +-INCLUDE_DIRS= -I../include +- -COMPILE_FLAGS= -DHAVE_PATHS_H -DIPX_CHANGE -DHAVE_MMAP -+COMPILE_FLAGS= -DHAVE_PATHS_H -DHAVE_MMAP ++CPPFLAGS += -I../include ++CPPFLAGS += -DHAVE_PATHS_H -DHAVE_MMAP - CFLAGS= $(COPTS) $(COMPILE_FLAGS) $(INCLUDE_DIRS) '-DDESTDIR="@DESTDIR@"' +-CFLAGS= $(COPTS) $(COMPILE_FLAGS) $(INCLUDE_DIRS) '-DDESTDIR="@DESTDIR@"' ++CFLAGS+= $(COPTS) $(COMPILE_FLAGS) $(INCLUDE_DIRS) '-DDESTDIR="@DESTDIR@"' -@@ -99,7 +99,7 @@ ifdef USE_SRP + ifdef CHAPMS + CFLAGS += -DCHAPMS=1 +@@ -99,7 +89,7 @@ ifdef USE_SRP CFLAGS += -DUSE_SRP -DOPENSSL -I/usr/local/ssl/include LIBS += -lsrp -L/usr/local/ssl/lib -lcrypto TARGETS += srp-entry @@ -39,7 +70,7 @@ MANPAGES += srp-entry.8 EXTRACLEAN += srp-entry.o NEEDDES=y -@@ -117,10 +117,8 @@ CFLAGS += -DHAS_SHADOW +@@ -117,10 +107,8 @@ CFLAGS += -DHAS_SHADOW #LIBS += -lshadow $(LIBS) endif @@ -50,7 +81,7 @@ ifdef NEEDDES ifndef USE_CRYPT -@@ -200,7 +198,7 @@ all: $(TARGETS) +@@ -200,16 +188,16 @@ all: $(TARGETS) install: pppd mkdir -p $(BINDIR) $(MANDIR) $(EXTRAINSTALL) @@ -59,3 +90,20 @@ if chgrp pppusers $(BINDIR)/pppd 2>/dev/null; then \ chmod o-rx,u+s $(BINDIR)/pppd; fi $(INSTALL) -c -m 444 pppd.8 $(MANDIR) + + pppd: $(PPPDOBJS) +- $(CC) $(CFLAGS) $(LDFLAGS) -o pppd $(PPPDOBJS) $(LIBS) ++ $(CC) $(LDFLAGS) -o pppd $(PPPDOBJS) $(LIBS) + + srp-entry: srp-entry.c +- $(CC) $(CFLAGS) $(LDFLAGS) -o $@ srp-entry.c $(LIBS) ++ $(CC) $(LDFLAGS) -o $@ srp-entry.c $(LIBS) + + install-devel: + mkdir -p $(INCDIR)/pppd +@@ -219,4 +207,4 @@ clean: + rm -f $(PPPDOBJS) $(EXTRACLEAN) $(TARGETS) *~ #* core + + depend: +- $(CPP) -M $(CFLAGS) $(PPPDSRCS) >.depend ++ $(CPP) -M $(CPPFLAGS) $(CFLAGS) $(PPPDSRCS) >.depend diff --git a/package/ppp/patches/patch-pppd_chap_ms_c b/package/ppp/patches/patch-pppd_chap_ms_c index c20fc8163..b829221d4 100644 --- a/package/ppp/patches/patch-pppd_chap_ms_c +++ b/package/ppp/patches/patch-pppd_chap_ms_c @@ -1,6 +1,6 @@ ---- ppp-2.4.4.orig/pppd/chap_ms.c 2006-05-21 13:56:40.000000000 +0200 -+++ ppp-2.4.4/pppd/chap_ms.c 2009-06-05 19:12:00.000000000 +0200 -@@ -897,13 +897,17 @@ set_mppe_enc_types(int policy, int types +--- ppp-2.4.5.orig/pppd/chap_ms.c 2009-11-16 23:26:07.000000000 +0100 ++++ ppp-2.4.5/pppd/chap_ms.c 2011-01-16 15:51:05.000000000 +0100 +@@ -898,13 +898,17 @@ set_mppe_enc_types(int policy, int types /* * Disable undesirable encryption types. Note that we don't ENABLE * any encryption types, to avoid overriding manual configuration. diff --git a/package/ppp/patches/patch-pppd_main_c b/package/ppp/patches/patch-pppd_main_c index 22e6a64f8..630420deb 100644 --- a/package/ppp/patches/patch-pppd_main_c +++ b/package/ppp/patches/patch-pppd_main_c @@ -1,5 +1,5 @@ ---- ppp-2.4.4.orig/pppd/main.c 2006-06-04 05:52:50.000000000 +0200 -+++ ppp-2.4.4/pppd/main.c 2009-06-05 19:12:00.000000000 +0200 +--- ppp-2.4.5.orig/pppd/main.c 2009-11-16 23:26:07.000000000 +0100 ++++ ppp-2.4.5/pppd/main.c 2011-01-16 15:51:05.000000000 +0100 @@ -90,6 +90,7 @@ #include <sys/socket.h> #include <netinet/in.h> @@ -8,7 +8,7 @@ #include "pppd.h" #include "magic.h" -@@ -227,6 +228,7 @@ static struct subprocess *children; +@@ -228,6 +229,7 @@ static struct subprocess *children; /* Prototypes for procedures local to this file. */ @@ -16,7 +16,7 @@ static void setup_signals __P((void)); static void create_pidfile __P((int pid)); static void create_linkpidfile __P((int pid)); -@@ -529,6 +531,7 @@ main(argc, argv) +@@ -530,6 +532,7 @@ main(argc, argv) info("Starting link"); } @@ -24,7 +24,7 @@ gettimeofday(&start_time, NULL); script_unsetenv("CONNECT_TIME"); script_unsetenv("BYTES_SENT"); -@@ -1262,6 +1265,36 @@ struct callout { +@@ -1263,6 +1266,36 @@ struct callout { static struct callout *callout = NULL; /* Callout list */ static struct timeval timenow; /* Current time */ @@ -61,7 +61,7 @@ /* * timeout - Schedule a timeout. -@@ -1332,6 +1365,8 @@ calltimeout() +@@ -1333,6 +1366,8 @@ calltimeout() { struct callout *p; @@ -70,7 +70,7 @@ while (callout != NULL) { p = callout; -@@ -1359,6 +1394,8 @@ timeleft(tvp) +@@ -1360,6 +1395,8 @@ timeleft(tvp) { if (callout == NULL) return NULL; diff --git a/package/ppp/patches/patch-pppd_plugins_Makefile_linux b/package/ppp/patches/patch-pppd_plugins_Makefile_linux new file mode 100644 index 000000000..9f78f3d19 --- /dev/null +++ b/package/ppp/patches/patch-pppd_plugins_Makefile_linux @@ -0,0 +1,29 @@ +--- ppp-2.4.5.orig/pppd/plugins/Makefile.linux 2009-11-16 23:26:07.000000000 +0100 ++++ ppp-2.4.5/pppd/plugins/Makefile.linux 2011-01-16 17:14:34.000000000 +0100 +@@ -1,13 +1,8 @@ +-#CC = gcc +-COPTS = -O2 -g +-CFLAGS = $(COPTS) -I.. -I../../include -fPIC +-LDFLAGS = -shared +-INSTALL = install ++include ../../makedefs.linux + +-DESTDIR = $(INSTROOT)@DESTDIR@ +-BINDIR = $(DESTDIR)/sbin +-MANDIR = $(DESTDIR)/share/man/man8 +-LIBDIR = $(DESTDIR)/lib/pppd/$(VERSION) ++CPPFLAGS += -I.. -I../../include ++CFLAGS += -fPIC ++LDFLAGS += -shared + + SUBDIRS := rp-pppoe pppoatm pppol2tp + # Uncomment the next line to include the radius authentication plugin +@@ -23,7 +18,7 @@ all: $(PLUGINS) + for d in $(SUBDIRS); do $(MAKE) $(MFLAGS) -C $$d all; done + + %.so: %.c +- $(CC) -o $@ $(LDFLAGS) $(CFLAGS) $^ ++ $(CC) -o $@ $(LDFLAGS) $(CPPFLAGS) $(CFLAGS) $^ + + VERSION = $(shell awk -F '"' '/VERSION/ { print $$2; }' ../patchlevel.h) + diff --git a/package/ppp/patches/patch-pppd_plugins_pppoatm_Makefile_linux b/package/ppp/patches/patch-pppd_plugins_pppoatm_Makefile_linux new file mode 100644 index 000000000..e7fb3f5e7 --- /dev/null +++ b/package/ppp/patches/patch-pppd_plugins_pppoatm_Makefile_linux @@ -0,0 +1,36 @@ +--- ppp-2.4.5.orig/pppd/plugins/pppoatm/Makefile.linux 2009-11-16 23:26:07.000000000 +0100 ++++ ppp-2.4.5/pppd/plugins/pppoatm/Makefile.linux 2011-01-16 21:12:55.000000000 +0100 +@@ -1,13 +1,10 @@ +-#CC = gcc +-COPTS = -O2 -g +-CFLAGS = $(COPTS) -I../.. -I../../../include -fPIC +-LDFLAGS = -shared +-INSTALL = install ++include ../../../makedefs.linux + +-#*********************************************************************** ++CPPFLAGS += -I../.. -I../../../include ++CFLAGS += -fPIC ++LDFLAGS += -shared + +-DESTDIR = $(INSTROOT)@DESTDIR@ +-LIBDIR = $(DESTDIR)/lib/pppd/$(VERSION) ++#*********************************************************************** + + VERSION = $(shell awk -F '"' '/VERSION/ { print $$2; }' ../../patchlevel.h) + +@@ -33,7 +30,7 @@ endif + all: $(PLUGIN) + + $(PLUGIN): $(PLUGIN_OBJS) +- $(CC) $(CFLAGS) -o $@ -shared $^ $(LIBS) ++ $(CC) $(LDFLAGS) -o $@ $^ $(LIBS) + + install: all + $(INSTALL) -d -m 755 $(LIBDIR) +@@ -43,4 +40,4 @@ clean: + rm -f *.o *.so + + %.o: %.c +- $(CC) $(CFLAGS) -c -o $@ $< ++ $(CC) $(CPPFLAGS) $(CFLAGS) -c -o $@ $< diff --git a/package/ppp/patches/patch-pppd_plugins_pppol2tp_Makefile_linux b/package/ppp/patches/patch-pppd_plugins_pppol2tp_Makefile_linux new file mode 100644 index 000000000..4c46c5971 --- /dev/null +++ b/package/ppp/patches/patch-pppd_plugins_pppol2tp_Makefile_linux @@ -0,0 +1,41 @@ +--- ppp-2.4.5.orig/pppd/plugins/pppol2tp/Makefile.linux 2009-11-16 23:26:07.000000000 +0100 ++++ ppp-2.4.5/pppd/plugins/pppol2tp/Makefile.linux 2011-01-16 21:32:19.000000000 +0100 +@@ -1,13 +1,10 @@ +-#CC = gcc +-COPTS = -O2 -g +-CFLAGS = $(COPTS) -I. -I../.. -I../../../include -fPIC +-LDFLAGS = -shared +-INSTALL = install ++include ../../../makedefs.linux + +-#*********************************************************************** ++CPPFLAGS += -I. -I../.. -I../../../include ++#CFLAGS += -fPIC ++#LDFLAGS += -shared + +-DESTDIR = @DESTDIR@ +-LIBDIR = $(DESTDIR)/lib/pppd/$(VERSION) ++#*********************************************************************** + + VERSION = $(shell awk -F '"' '/VERSION/ { print $$2; }' ../../patchlevel.h) + +@@ -16,7 +13,11 @@ PLUGINS := pppol2tp.so openl2tp.so + all: $(PLUGINS) + + %.so: %.o +- $(CC) $(CFLAGS) -o $@ -shared $^ $(LIBS) ++ $(CC) $(LDFLAGS) -o $@ $^ $(LIBS) ++ echo $(LDFLAGS) ++ ++%.o: %.c ++ $(CC) $(CPPFLAGS) $(CFLAGS) -c -o $@ $< + + install: all + $(INSTALL) -d -m 755 $(LIBDIR) +@@ -25,5 +26,4 @@ install: all + clean: + rm -f *.o *.so + +-%.o: %.c +- $(CC) $(CFLAGS) -c -o $@ $< ++.PHONY: clean diff --git a/package/ppp/patches/patch-pppd_plugins_radius_Makefile_linux b/package/ppp/patches/patch-pppd_plugins_radius_Makefile_linux index bee2a80cf..d01aeb86c 100644 --- a/package/ppp/patches/patch-pppd_plugins_radius_Makefile_linux +++ b/package/ppp/patches/patch-pppd_plugins_radius_Makefile_linux @@ -1,16 +1,28 @@ ---- ppp-2.4.4.orig/pppd/plugins/radius/Makefile.linux 2006-06-04 07:04:14.000000000 +0200 -+++ ppp-2.4.4/pppd/plugins/radius/Makefile.linux 2009-06-05 19:12:00.000000000 +0200 -@@ -12,7 +12,8 @@ VERSION = $(shell awk -F '"' '/VERSION/ - INSTALL = install +--- ppp-2.4.5.orig/pppd/plugins/radius/Makefile.linux 2009-11-16 23:26:07.000000000 +0100 ++++ ppp-2.4.5/pppd/plugins/radius/Makefile.linux 2011-01-16 21:35:47.000000000 +0100 +@@ -1,18 +1,14 @@ + # Makefile for RADIUS plugin + # + # Copyright 2002 Roaring Penguin Software Inc. +-# + +-DESTDIR = $(INSTROOT)@DESTDIR@ +-MANDIR = $(DESTDIR)/share/man/man8 +-LIBDIR = $(DESTDIR)/lib/pppd/$(VERSION) ++include ../../../makedefs.linux + +-VERSION = $(shell awk -F '"' '/VERSION/ { print $$2; }' ../../patchlevel.h) ++CPPFLAGS+=-I. -I../.. -I../../../include -DRC_LOG_FACILITY=LOG_DAEMON + +-INSTALL = install ++VERSION = $(shell awk -F '"' '/VERSION/ { print $$2; }' ../../patchlevel.h) PLUGIN=radius.so radattr.so radrealms.so -CFLAGS=-I. -I../.. -I../../../include -O2 -fPIC -DRC_LOG_FACILITY=LOG_DAEMON -+COPTS = -O2 -+CFLAGS=-I. -I../.. -I../../../include $(COPTS) -fPIC -DRC_LOG_FACILITY=LOG_DAEMON # Uncomment the next line to include support for Microsoft's # MS-CHAP authentication protocol. -@@ -36,9 +37,9 @@ all: $(PLUGIN) +@@ -36,25 +32,26 @@ all: $(PLUGIN) install: all $(INSTALL) -d -m 755 $(LIBDIR) @@ -23,9 +35,21 @@ $(INSTALL) -c -m 444 pppd-radius.8 $(MANDIR) $(INSTALL) -c -m 444 pppd-radattr.8 $(MANDIR) -@@ -54,7 +55,7 @@ radrealms.so: radrealms.o + radius.so: radius.o libradiusclient.a +- $(CC) -o radius.so -shared radius.o libradiusclient.a ++ $(CC) $(LDFLAGS) -o radius.so radius.o libradiusclient.a + + radattr.so: radattr.o +- $(CC) -o radattr.so -shared radattr.o ++ $(CC) $(LDFLAGS) -o radattr.so radattr.o + + radrealms.so: radrealms.o +- $(CC) -o radrealms.so -shared radrealms.o ++ $(CC) $(LDFLAGS) -o radrealms.so radrealms.o + CLIENTOBJS = avpair.o buildreq.o config.o dict.o ip_util.o \ clientid.o sendserver.o lock.o util.o md5.o ++ libradiusclient.a: $(CLIENTOBJS) - $(AR) rv $@ $? + $(TARGET_AR) rcsv $@ $? diff --git a/package/ppp/patches/patch-pppd_plugins_rp-pppoe_Makefile_linux b/package/ppp/patches/patch-pppd_plugins_rp-pppoe_Makefile_linux new file mode 100644 index 000000000..09d845f6a --- /dev/null +++ b/package/ppp/patches/patch-pppd_plugins_rp-pppoe_Makefile_linux @@ -0,0 +1,80 @@ +--- ppp-2.4.5.orig/pppd/plugins/rp-pppoe/Makefile.linux 2009-11-16 23:26:07.000000000 +0100 ++++ ppp-2.4.5/pppd/plugins/rp-pppoe/Makefile.linux 2011-01-16 21:38:08.000000000 +0100 +@@ -1,6 +1,3 @@ +-# Generated automatically from Makefile.in by configure. +-#*********************************************************************** +-# + # Makefile + # + # Makefile for Roaring Penguin's Linux PPPoE plugin. +@@ -13,52 +10,50 @@ + # + # $Id: Makefile.linux,v 1.8 2008/06/09 08:34:23 paulus Exp $ + #*********************************************************************** +- +-DESTDIR = $(INSTROOT)@DESTDIR@ +-BINDIR = $(DESTDIR)/sbin +-LIBDIR = $(DESTDIR)/lib/pppd/$(PPPDVERSION) +- +-PPPDVERSION = $(shell awk -F '"' '/VERSION/ { print $$2; }' ../../patchlevel.h) +- +-INSTALL = install ++include ../../../makedefs.linux + + # Version is set ONLY IN THE MAKEFILE! Don't delete this! + RP_VERSION=3.8p + +-COPTS=-O2 -g +-CFLAGS=$(COPTS) -I../../../include '-DRP_VERSION="$(RP_VERSION)"' ++CPPFLAGS += -I../../.. -I../../../include '-DRP_VERSION="$(RP_VERSION)"' ++CFLAGS += -fPIC ++LDFLAGS += -shared ++ ++VERSION = $(shell awk -F '"' '/VERSION/ { print $$2; }' ../../patchlevel.h) ++ + all: rp-pppoe.so pppoe-discovery + + pppoe-discovery: pppoe-discovery.o debug.o +- $(CC) -o pppoe-discovery pppoe-discovery.o debug.o ++ $(CC) $(LDFLAGS) -o pppoe-discovery pppoe-discovery.o debug.o + + pppoe-discovery.o: pppoe-discovery.c +- $(CC) $(CFLAGS) -c -o pppoe-discovery.o pppoe-discovery.c ++ $(CC) $(CPPFLAGS) $(CFLAGS) -c -o $@ $^ + + debug.o: debug.c +- $(CC) $(CFLAGS) -c -o debug.o debug.c ++ $(CC) $(CPPFLAGS) $(CFLAGS) -c -o $@ $^ + + rp-pppoe.so: plugin.o discovery.o if.o common.o +- $(CC) -o rp-pppoe.so -shared plugin.o discovery.o if.o common.o ++ $(CC) $(LDFLAGS) -o $@ $^ + + install: all + $(INSTALL) -d -m 755 $(LIBDIR) +- $(INSTALL) -s -c -m 4550 rp-pppoe.so $(LIBDIR) ++ $(INSTALL) -c -m 4550 rp-pppoe.so $(LIBDIR) + $(INSTALL) -d -m 755 $(BINDIR) +- $(INSTALL) -s -c -m 555 pppoe-discovery $(BINDIR) ++ $(INSTALL) -c -m 555 pppoe-discovery $(BINDIR) + + clean: + rm -f *.o *.so pppoe-discovery + + plugin.o: plugin.c +- $(CC) $(CFLAGS) -I../../.. -c -o plugin.o -fPIC plugin.c ++ $(CC) $(CPPFLAGS) $(CFLAGS) -c -o plugin.o plugin.c + + discovery.o: discovery.c +- $(CC) $(CFLAGS) -I../../.. -c -o discovery.o -fPIC discovery.c ++ $(CC) $(CPPFLAGS) $(CFLAGS) -c -o discovery.o discovery.c + + if.o: if.c +- $(CC) $(CFLAGS) -I../../.. -c -o if.o -fPIC if.c ++ $(CC) $(CPPFLAGS) $(CFLAGS) -c -o if.o if.c + + common.o: common.c +- $(CC) $(CFLAGS) -I../../.. -c -o common.o -fPIC common.c ++ $(CC) $(CPPFLAGS) $(CFLAGS) -c -o common.o common.c + ++.PHONY: clean diff --git a/package/ppp/patches/patch-pppd_pppd_8 b/package/ppp/patches/patch-pppd_pppd_8 index 4e19f91d2..c877824eb 100644 --- a/package/ppp/patches/patch-pppd_pppd_8 +++ b/package/ppp/patches/patch-pppd_pppd_8 @@ -1,6 +1,6 @@ ---- ppp-2.4.4.orig/pppd/pppd.8 2006-06-16 02:01:23.000000000 +0200 -+++ ppp-2.4.4/pppd/pppd.8 2009-06-05 19:12:00.000000000 +0200 -@@ -627,9 +627,29 @@ control, as for the \fIcrtscts\fR option +--- ppp-2.4.5.orig/pppd/pppd.8 2009-11-16 23:26:07.000000000 +0100 ++++ ppp-2.4.5/pppd/pppd.8 2011-01-16 15:51:05.000000000 +0100 +@@ -638,9 +638,29 @@ control, as for the \fIcrtscts\fR option Enables the use of PPP multilink; this is an alias for the `multilink' option. This option is currently only available under Linux. .TP @@ -33,7 +33,7 @@ .TP .B mpshortseq Enables the use of short (12-bit) sequence numbers in multilink -@@ -767,17 +787,11 @@ peer is buggy. +@@ -778,17 +798,11 @@ peer is buggy. Disables the use of PPP multilink. This option is currently only available under Linux. .TP @@ -55,7 +55,7 @@ .TP .B nompshortseq Disables the use of short (12-bit) sequence numbers in the PPP -@@ -958,19 +972,6 @@ peer using PAP. +@@ -980,19 +994,6 @@ peer using PAP. Require the peer to authenticate itself using CHAP [Challenge Handshake Authentication Protocol] authentication. .TP diff --git a/package/ppp/patches/patch-pppdump_Makefile_linux b/package/ppp/patches/patch-pppdump_Makefile_linux index 10a5e2728..796548ab7 100644 --- a/package/ppp/patches/patch-pppdump_Makefile_linux +++ b/package/ppp/patches/patch-pppdump_Makefile_linux @@ -1,19 +1,33 @@ ---- ppp-2.4.4.orig/pppdump/Makefile.linux 2006-06-04 07:04:14.000000000 +0200 -+++ ppp-2.4.4/pppdump/Makefile.linux 2009-06-05 19:12:00.000000000 +0200 -@@ -2,7 +2,8 @@ DESTDIR = $(INSTROOT)@DESTDIR@ - BINDIR = $(DESTDIR)/sbin - MANDIR = $(DESTDIR)/share/man/man8 +--- ppp-2.4.5.orig/pppdump/Makefile.linux 2009-11-16 23:26:07.000000000 +0100 ++++ ppp-2.4.5/pppdump/Makefile.linux 2011-01-16 16:58:39.000000000 +0100 +@@ -1,21 +1,19 @@ +-DESTDIR = $(INSTROOT)@DESTDIR@ +-BINDIR = $(DESTDIR)/sbin +-MANDIR = $(DESTDIR)/share/man/man8 ++include ../makedefs.linux -CFLAGS= -O -I../include/net -+COPTS = -O -+CFLAGS= $(COPTS) -I../include/net ++CPPFLAGS+= -I../include/net OBJS = pppdump.o bsd-comp.o deflate.o zlib.o - INSTALL= install -@@ -17,5 +18,5 @@ clean: +-INSTALL= install +- + all: pppdump + + pppdump: $(OBJS) +- $(CC) -o pppdump $(OBJS) +- +-clean: +- rm -f pppdump $(OBJS) *~ ++ $(CC) $(LDFLAGS) -o pppdump $(OBJS) install: mkdir -p $(BINDIR) $(MANDIR) - $(INSTALL) -s -c pppdump $(BINDIR) + $(INSTALL) -c pppdump $(BINDIR) $(INSTALL) -c -m 444 pppdump.8 $(MANDIR) ++ ++clean: ++ rm -f pppdump $(OBJS) *~ ++ ++.PHONY: clean diff --git a/package/ppp/patches/patch-pppstats_Makefile_linux b/package/ppp/patches/patch-pppstats_Makefile_linux index 8c02431dd..81dfd920b 100644 --- a/package/ppp/patches/patch-pppstats_Makefile_linux +++ b/package/ppp/patches/patch-pppstats_Makefile_linux @@ -1,11 +1,48 @@ ---- ppp-2.4.4.orig/pppstats/Makefile.linux 2006-06-04 07:07:46.000000000 +0200 -+++ ppp-2.4.4/pppstats/Makefile.linux 2009-06-05 19:12:00.000000000 +0200 -@@ -22,7 +22,7 @@ all: pppstats +--- ppp-2.4.5.orig/pppstats/Makefile.linux 2009-11-16 23:26:07.000000000 +0100 ++++ ppp-2.4.5/pppstats/Makefile.linux 2011-01-16 17:11:22.000000000 +0100 +@@ -1,36 +1,27 @@ + # + # pppstats makefile + # $Id: Makefile.linux,v 1.9 2006/06/04 05:07:46 paulus Exp $ +-# +-DESTDIR = $(INSTROOT)@DESTDIR@ +-BINDIR = $(DESTDIR)/sbin +-MANDIR = $(DESTDIR)/share/man/man8 ++include ../makedefs.linux ++ ++CPPFLAGS += -I../include + PPPSTATSRCS = pppstats.c + PPPSTATOBJS = pppstats.o + +-#CC = gcc +-COPTS = -O +-COMPILE_FLAGS = -I../include +-LIBS = +- +-INSTALL= install +- +-CFLAGS = $(COPTS) $(COMPILE_FLAGS) +- + all: pppstats + ++pppstats: $(PPPSTATSRCS) ++ $(CC) $(CPPFLAGS) $(CFLAGS) $(LDLAGS) -o pppstats pppstats.c $(LIBS) ++ install: pppstats -mkdir -p $(MANDIR) - $(INSTALL) -s -c pppstats $(BINDIR) + $(INSTALL) -c pppstats $(BINDIR) $(INSTALL) -c -m 444 pppstats.8 $(MANDIR) - pppstats: $(PPPSTATSRCS) +-pppstats: $(PPPSTATSRCS) +- $(CC) $(CFLAGS) -o pppstats pppstats.c $(LIBS) +- + clean: + rm -f pppstats *~ #* core + + depend: + cpp -M $(CFLAGS) $(PPPSTATSRCS) >.depend +-# makedepend $(CFLAGS) $(PPPSTATSRCS) ++ ++.PHONY: clean diff --git a/package/ppp/src/makedefs.linux b/package/ppp/src/makedefs.linux new file mode 100644 index 000000000..061efabc6 --- /dev/null +++ b/package/ppp/src/makedefs.linux @@ -0,0 +1,14 @@ +CC ?= gcc +CPPFLAGS ?= +CFLAGS ?= -O -pipe +LDFLAGS ?= +LIBS ?= + +INSTALL ?= install + +# Default installation locations +DESTDIR = $(INSTROOT)/usr +BINDIR = $(DESTDIR)/sbin +MANDIR = $(DESTDIR)/share/man/man8 +INCDIR = $(DESTDIR)/include +LIBDIR = $(DESTDIR)/lib/pppd/$(VERSION) diff --git a/package/pptp/Makefile b/package/pptp/Makefile index c68d50958..d789c8003 100644 --- a/package/pptp/Makefile +++ b/package/pptp/Makefile @@ -19,9 +19,6 @@ $(eval $(call PKG_template,PPTP,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_ CONFIG_STYLE:= manual INSTALL_STYLE:= manual -MAKE_FLAGS+= CC="${TARGET_CC}" \ - CFLAGS="${TARGET_CFLAGS}" - do-install: ${INSTALL_DIR} ${IDIR_PPTP}/sbin ${INSTALL_DIR} ${IDIR_PPTP}/usr/sbin diff --git a/package/pptp/patches/patch-Makefile b/package/pptp/patches/patch-Makefile new file mode 100644 index 000000000..1b7ad4a3d --- /dev/null +++ b/package/pptp/patches/patch-Makefile @@ -0,0 +1,22 @@ +--- pptp-1.6.0.orig/Makefile 2005-02-18 02:42:45.000000000 +0100 ++++ pptp-1.6.0/Makefile 2011-01-16 21:44:38.000000000 +0100 +@@ -11,14 +11,15 @@ BINDIR=$(DESTDIR)/usr/sbin + MANDIR=$(DESTDIR)/usr/share/man/man8 + PPPDIR=$(DESTDIR)/etc/ppp + +-CC = gcc ++CC ?= gcc + RM = rm -f + OPTIMIZE= -O0 + DEBUG = -g + INCLUDE = +-CFLAGS = -Wall $(OPTIMIZE) $(DEBUG) $(INCLUDE) +-LIBS = -lutil +-LDFLAGS = ++CPPFLAGS ?= ++CFLAGS ?= -Wall $(OPTIMIZE) $(DEBUG) $(INCLUDE) ++LIBS ?= -lutil ++LDFLAGS ?= + + PPTP_BIN = pptp + 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/proftpd/Makefile b/package/proftpd/Makefile index 6cfa849ac..fbae31c18 100644 --- a/package/proftpd/Makefile +++ b/package/proftpd/Makefile @@ -13,6 +13,9 @@ PKG_URL:= http://www.proftpd.org/ PKG_SITES:= ftp://ftp.proftpd.org/distrib/source/ PKG_NOPARALLEL:= 1 +PKG_FLAVOURS_PROFTPD:= WITH_FTPUSERS +PKGFD_WITH_FTPUSERS:= install /etc/ftpusers along with proftpd + include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,PROFTPD,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) @@ -29,5 +32,8 @@ post-install: $(IDIR_PROFTPD)/usr/bin/ $(INSTALL_BIN) $(WRKINST)/usr/sbin/{ftpshut,proftpd} \ $(IDIR_PROFTPD)/usr/sbin/ +ifeq (${ADK_PACKAGE_PROFTPD_WITH_FTPUSERS},y) + ${INSTALL_DATA} ./files/ftpusers ${IDIR_PROFTPD}/etc/ +endif include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/proftpd/files/ftpusers b/package/proftpd/files/ftpusers new file mode 100644 index 000000000..4bc8872dc --- /dev/null +++ b/package/proftpd/files/ftpusers @@ -0,0 +1,37 @@ +# Provided by ftpbase (dont remove this line!) +# /etc/ftpusers: list of users disallowed FTP access +# $Header: /var/cvsroot/gentoo-x86/net-ftp/ftpbase/files/ftpusers,v 1.1 2005/06/28 14:52:26 uberlord Exp $ + +halt +operator +root +shutdown +sync +bin +daemon +adm +lp +mail +postmaster +news +uucp +man +games +at +cron +www +named +squid +gdm +mysql +postgres +guest +nobody +alias +qmaild +qmaill +qmailp +qmailq +qmailr +qmails +postfix diff --git a/package/proftpd/files/proftpd.conffiles b/package/proftpd/files/proftpd.conffiles index 9796c366f..3ff0fb2e3 100644 --- a/package/proftpd/files/proftpd.conffiles +++ b/package/proftpd/files/proftpd.conffiles @@ -1 +1,2 @@ /etc/proftpd.conf +/etc/ftpusers diff --git a/package/python2/Makefile b/package/python2/Makefile index ac40ca66f..dc9092dd9 100644 --- a/package/python2/Makefile +++ b/package/python2/Makefile @@ -9,10 +9,11 @@ PKG_RELEASE:= 1 PKG_MD5SUM:= 15ed56733655e3fab785e49a7278d2fb PKG_DESCR:= Python scripting language (Version 2) PKG_SECTION:= lang -PKG_DEPENDS:= libpthread zlib libffi -PKG_BUILDDEP:= zlib libffi +PKG_DEPENDS:= libpthread zlib libffi libopenssl +PKG_BUILDDEP:= zlib libffi openssl PKG_URL:= http://www.python.org/ PKG_SITES:= http://www.python.org/ftp/python/${PKG_VERSION}/ +PKG_OPTS:= noscripts PKG_HOST_DEPENDS:= !netbsd !openbsd !cygwin @@ -21,7 +22,7 @@ WRKDIST= ${WRKDIR}/Python-${PKG_VERSION} include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,PYTHON2,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +$(eval $(call PKG_template,PYTHON2,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) MAKE_ENV+= OPT="$(TARGET_CFLAGS)" \ RANLIB="${TARGET_CROSS}ranlib" \ @@ -39,12 +40,12 @@ post-extract: (cd ${WRKBUILD}; rm -rf config.{cache,status} ; \ OPT="$(HOSTCFLAGS)" \ ./configure --without-cxx-main --without-threads \ - --prefix=$(STAGING_HOST_DIR) \ + --prefix=$(STAGING_HOST_DIR)/usr \ ); $(MAKE) -C ${WRKBUILD} python Parser/pgen $(MAKE) -C ${WRKBUILD} install - ${CP} ${WRKBUILD}/Parser/pgen ${STAGING_HOST_DIR}/bin/pgen - ${CP} ${WRKBUILD}/python ${STAGING_HOST_DIR}/bin/hostpython + ${CP} ${WRKBUILD}/Parser/pgen ${STAGING_HOST_DIR}/usr/bin/pgen + ${CP} ${WRKBUILD}/python ${STAGING_HOST_DIR}/usr/bin/hostpython ${CP} ${WRKBUILD}/Parser/pgen ${WRKBUILD}/Parser/hostpgen ${CP} ${WRKBUILD}/python ${WRKBUILD}/hostpython $(MAKE) -C ${WRKBUILD} clean @@ -61,5 +62,8 @@ post-install: ${CP} ${WRKINST}/usr/lib/python2.7/* ${IDIR_PYTHON2}/usr/lib/python2.7 ${CP} ${WRKINST}/usr/include/python2.7/* ${IDIR_PYTHON2}/usr/include/python2.7 -find ${IDIR_PYTHON2} -name "\*.pyc" -o -name "*\.pyo" -exec rm {} \; + # workaround, copy host python-config to target scripts directory + ${CP} ${STAGING_HOST_DIR}/usr/bin/python*-config ${STAGING_TARGET_DIR}/scripts + ${CP} ${STAGING_HOST_DIR}/usr/bin/python*-config ${STAGING_TARGET_DIR}/usr/bin include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/python2/files/python-config.in b/package/python2/files/python-config.in index 8419bd84a..0074d0304 100644 --- a/package/python2/files/python-config.in +++ b/package/python2/files/python-config.in @@ -38,8 +38,8 @@ for opt in opt_flags: print sysconfig.EXEC_PREFIX elif opt in ('--includes', '--cflags'): - flags = ['-I' + re.sub('host/', 'target/usr/', sysconfig.get_python_inc()), - '-I' + re.sub('host/', 'target/usr/', sysconfig.get_python_inc(plat_specific=True))] + flags = ['-I' + re.sub('host_', 'target_', sysconfig.get_python_inc()), + '-I' + re.sub('host_', 'target_', sysconfig.get_python_inc(plat_specific=True))] if opt == '--cflags': flags.extend(getvar('CFLAGS').split()) print ' '.join(flags) diff --git a/package/python2/patches/patch-Misc_python_pc b/package/python2/patches/patch-Misc_python_pc deleted file mode 100644 index 174230d83..000000000 --- a/package/python2/patches/patch-Misc_python_pc +++ /dev/null @@ -1,11 +0,0 @@ ---- Python-2.7.1.orig/Misc/python.pc 2010-12-27 21:24:34.000000000 +0100 -+++ Python-2.7.1/Misc/python.pc 2010-12-27 21:07:05.000000000 +0100 -@@ -7,7 +7,7 @@ Name: Python - Description: Python library - Requires: - Version: 2.7 --Libs.private: -ldl -framework CoreFoundation -+Libs.private: -lpthread -ldl -lpthread - Libs: -L${libdir} -lpython2.7 - Cflags: -I${includedir}/python2.7 - diff --git a/package/python2/patches/patch-pyconfig_h b/package/python2/patches/patch-pyconfig_h deleted file mode 100644 index 52e21767c..000000000 --- a/package/python2/patches/patch-pyconfig_h +++ /dev/null @@ -1,521 +0,0 @@ ---- Python-2.7.1.orig/pyconfig.h 2010-12-27 21:24:34.000000000 +0100 -+++ Python-2.7.1/pyconfig.h 2010-12-27 21:07:05.000000000 +0100 -@@ -32,10 +32,10 @@ - - /* Define if C doubles are 64-bit IEEE 754 binary format, stored with the - least significant byte first */ --#define DOUBLE_IS_LITTLE_ENDIAN_IEEE754 1 -+/* #undef DOUBLE_IS_LITTLE_ENDIAN_IEEE754 */ - - /* Define if --enable-ipv6 is specified */ --#define ENABLE_IPV6 1 -+/* #undef ENABLE_IPV6 */ - - /* Define if flock needs to be linked with bsd library. */ - /* #undef FLOCK_NEEDS_LIBBSD */ -@@ -63,7 +63,7 @@ - #define HAVE_ASINH 1 - - /* Define to 1 if you have the <asm/types.h> header file. */ --/* #undef HAVE_ASM_TYPES_H */ -+#define HAVE_ASM_TYPES_H 1 - - /* Define to 1 if you have the `atanh' function. */ - #define HAVE_ATANH 1 -@@ -75,7 +75,7 @@ - /* #undef HAVE_BIND_TEXTDOMAIN_CODESET */ - - /* Define to 1 if you have the <bluetooth/bluetooth.h> header file. */ --/* #undef HAVE_BLUETOOTH_BLUETOOTH_H */ -+#define HAVE_BLUETOOTH_BLUETOOTH_H 1 - - /* Define to 1 if you have the <bluetooth.h> header file. */ - /* #undef HAVE_BLUETOOTH_H */ -@@ -126,7 +126,7 @@ - #define HAVE_CTERMID 1 - - /* Define if you have the 'ctermid_r' function. */ --#define HAVE_CTERMID_R 1 -+/* #undef HAVE_CTERMID_R */ - - /* Define to 1 if you have the <curses.h> header file. */ - #define HAVE_CURSES_H 1 -@@ -185,7 +185,7 @@ - #define HAVE_DYNAMIC_LOADING 1 - - /* Define if you have the 'epoll' functions. */ --/* #undef HAVE_EPOLL */ -+#define HAVE_EPOLL 1 - - /* Define to 1 if you have the `erf' function. */ - #define HAVE_ERF 1 -@@ -215,10 +215,10 @@ - #define HAVE_FCNTL_H 1 - - /* Define if you have the 'fdatasync' function. */ --/* #undef HAVE_FDATASYNC */ -+#define HAVE_FDATASYNC 1 - - /* Define to 1 if you have the `finite' function. */ --#define HAVE_FINITE 1 -+/* #undef HAVE_FINITE */ - - /* Define to 1 if you have the `flock' function. */ - #define HAVE_FLOCK 1 -@@ -227,7 +227,7 @@ - #define HAVE_FORK 1 - - /* Define to 1 if you have the `forkpty' function. */ --#define HAVE_FORKPTY 1 -+/* #undef HAVE_FORKPTY */ - - /* Define to 1 if you have the `fpathconf' function. */ - #define HAVE_FPATHCONF 1 -@@ -267,7 +267,7 @@ - #define HAVE_GCC_ASM_FOR_X87 1 - - /* Define if you have the getaddrinfo function. */ --#define HAVE_GETADDRINFO 1 -+/* #undef HAVE_GETADDRINFO */ - - /* Define to 1 if you have the `getcwd' function. */ - #define HAVE_GETCWD 1 -@@ -279,10 +279,10 @@ - #define HAVE_GETGROUPS 1 - - /* Define to 1 if you have the `gethostbyname' function. */ --#define HAVE_GETHOSTBYNAME 1 -+/* #undef HAVE_GETHOSTBYNAME */ - - /* Define this if you have some version of gethostbyname_r() */ --/* #undef HAVE_GETHOSTBYNAME_R */ -+#define HAVE_GETHOSTBYNAME_R 1 - - /* Define this if you have the 3-arg version of gethostbyname_r(). */ - /* #undef HAVE_GETHOSTBYNAME_R_3_ARG */ -@@ -291,13 +291,13 @@ - /* #undef HAVE_GETHOSTBYNAME_R_5_ARG */ - - /* Define this if you have the 6-arg version of gethostbyname_r(). */ --/* #undef HAVE_GETHOSTBYNAME_R_6_ARG */ -+#define HAVE_GETHOSTBYNAME_R_6_ARG 1 - - /* Define to 1 if you have the `getitimer' function. */ - #define HAVE_GETITIMER 1 - - /* Define to 1 if you have the `getloadavg' function. */ --#define HAVE_GETLOADAVG 1 -+/* #undef HAVE_GETLOADAVG */ - - /* Define to 1 if you have the `getlogin' function. */ - #define HAVE_GETLOGIN 1 -@@ -327,25 +327,25 @@ - #define HAVE_GETPWENT 1 - - /* Define to 1 if you have the `getresgid' function. */ --/* #undef HAVE_GETRESGID */ -+#define HAVE_GETRESGID 1 - - /* Define to 1 if you have the `getresuid' function. */ --/* #undef HAVE_GETRESUID */ -+#define HAVE_GETRESUID 1 - - /* Define to 1 if you have the `getsid' function. */ - #define HAVE_GETSID 1 - - /* Define to 1 if you have the `getspent' function. */ --/* #undef HAVE_GETSPENT */ -+#define HAVE_GETSPENT 1 - - /* Define to 1 if you have the `getspnam' function. */ --/* #undef HAVE_GETSPNAM */ -+#define HAVE_GETSPNAM 1 - - /* Define to 1 if you have the `gettimeofday' function. */ - #define HAVE_GETTIMEOFDAY 1 - - /* Define to 1 if you have the `getwd' function. */ --#define HAVE_GETWD 1 -+/* #undef HAVE_GETWD */ - - /* Define to 1 if you have the <grp.h> header file. */ - #define HAVE_GRP_H 1 -@@ -381,7 +381,7 @@ - #define HAVE_KILLPG 1 - - /* Define if you have the 'kqueue' functions. */ --#define HAVE_KQUEUE 1 -+/* #undef HAVE_KQUEUE */ - - /* Define to 1 if you have the <langinfo.h> header file. */ - #define HAVE_LANGINFO_H 1 -@@ -390,13 +390,13 @@ - and long long is available and at least as big as an off_t. You may need to - add some flags for configuration and compilation to enable this mode. (For - Solaris and Linux, the necessary defines are already defined.) */ --/* #undef HAVE_LARGEFILE_SUPPORT */ -+#define HAVE_LARGEFILE_SUPPORT 1 - - /* Define to 1 if you have the `lchflags' function. */ - /* #undef HAVE_LCHFLAGS */ - - /* Define to 1 if you have the `lchmod' function. */ --#define HAVE_LCHMOD 1 -+/* #undef HAVE_LCHMOD */ - - /* Define to 1 if you have the `lchown' function. */ - #define HAVE_LCHOWN 1 -@@ -414,7 +414,7 @@ - /* #undef HAVE_LIBIEEE */ - - /* Define to 1 if you have the <libintl.h> header file. */ --/* #undef HAVE_LIBINTL_H */ -+#define HAVE_LIBINTL_H 1 - - /* Define if you have the readline library (-lreadline). */ - #define HAVE_LIBREADLINE 1 -@@ -429,10 +429,10 @@ - #define HAVE_LINK 1 - - /* Define to 1 if you have the <linux/netlink.h> header file. */ --/* #undef HAVE_LINUX_NETLINK_H */ -+#define HAVE_LINUX_NETLINK_H 1 - - /* Define to 1 if you have the <linux/tipc.h> header file. */ --/* #undef HAVE_LINUX_TIPC_H */ -+#define HAVE_LINUX_TIPC_H 1 - - /* Define to 1 if you have the `log1p' function. */ - #define HAVE_LOG1P 1 -@@ -465,7 +465,7 @@ - #define HAVE_MKTIME 1 - - /* Define to 1 if you have the `mremap' function. */ --/* #undef HAVE_MREMAP */ -+#define HAVE_MREMAP 1 - - /* Define to 1 if you have the <ncurses.h> header file. */ - #define HAVE_NCURSES_H 1 -@@ -474,16 +474,16 @@ - /* #undef HAVE_NDIR_H */ - - /* Define to 1 if you have the <netpacket/packet.h> header file. */ --/* #undef HAVE_NETPACKET_PACKET_H */ -+#define HAVE_NETPACKET_PACKET_H 1 - - /* Define to 1 if you have the `nice' function. */ - #define HAVE_NICE 1 - - /* Define to 1 if you have the `openpty' function. */ --#define HAVE_OPENPTY 1 -+/* #undef HAVE_OPENPTY */ - - /* Define if compiling using MacOS X 10.5 SDK or later. */ --#define HAVE_OSX105_SDK 1 -+/* #undef HAVE_OSX105_SDK */ - - /* Define to 1 if you have the `pathconf' function. */ - #define HAVE_PATHCONF 1 -@@ -519,10 +519,10 @@ - /* #undef HAVE_PTHREAD_INIT */ - - /* Define to 1 if you have the `pthread_sigmask' function. */ --/* #undef HAVE_PTHREAD_SIGMASK */ -+#define HAVE_PTHREAD_SIGMASK 1 - - /* Define to 1 if you have the <pty.h> header file. */ --/* #undef HAVE_PTY_H */ -+#define HAVE_PTY_H 1 - - /* Define to 1 if you have the `putenv' function. */ - #define HAVE_PUTENV 1 -@@ -537,7 +537,7 @@ - #define HAVE_RL_CALLBACK 1 - - /* Define if you can turn off readline's signal handling. */ --/* #undef HAVE_RL_CATCH_SIGNAL */ -+#define HAVE_RL_CATCH_SIGNAL 1 - - /* Define if you have readline 2.2 */ - #define HAVE_RL_COMPLETION_APPEND_CHARACTER 1 -@@ -549,7 +549,7 @@ - #define HAVE_RL_COMPLETION_MATCHES 1 - - /* Define if you have rl_completion_suppress_append */ --/* #undef HAVE_RL_COMPLETION_SUPPRESS_APPEND */ -+#define HAVE_RL_COMPLETION_SUPPRESS_APPEND 1 - - /* Define if you have readline 4.0 */ - #define HAVE_RL_PRE_INPUT_HOOK 1 -@@ -567,7 +567,7 @@ - #define HAVE_SEM_OPEN 1 - - /* Define to 1 if you have the `sem_timedwait' function. */ --/* #undef HAVE_SEM_TIMEDWAIT */ -+#define HAVE_SEM_TIMEDWAIT 1 - - /* Define to 1 if you have the `sem_unlink' function. */ - #define HAVE_SEM_UNLINK 1 -@@ -600,10 +600,10 @@ - #define HAVE_SETREGID 1 - - /* Define to 1 if you have the `setresgid' function. */ --/* #undef HAVE_SETRESGID */ -+#define HAVE_SETRESGID 1 - - /* Define to 1 if you have the `setresuid' function. */ --/* #undef HAVE_SETRESUID */ -+#define HAVE_SETRESUID 1 - - /* Define to 1 if you have the `setreuid' function. */ - #define HAVE_SETREUID 1 -@@ -618,7 +618,7 @@ - #define HAVE_SETVBUF 1 - - /* Define to 1 if you have the <shadow.h> header file. */ --/* #undef HAVE_SHADOW_H */ -+#define HAVE_SHADOW_H 1 - - /* Define to 1 if you have the `sigaction' function. */ - #define HAVE_SIGACTION 1 -@@ -630,13 +630,13 @@ - #define HAVE_SIGNAL_H 1 - - /* Define to 1 if you have the `sigrelse' function. */ --#define HAVE_SIGRELSE 1 -+/* #undef HAVE_SIGRELSE */ - - /* Define to 1 if you have the `snprintf' function. */ - #define HAVE_SNPRINTF 1 - - /* Define if sockaddr has sa_len member */ --#define HAVE_SOCKADDR_SA_LEN 1 -+/* #undef HAVE_SOCKADDR_SA_LEN */ - - /* struct sockaddr_storage (sys/socket.h) */ - #define HAVE_SOCKADDR_STORAGE 1 -@@ -645,7 +645,7 @@ - #define HAVE_SOCKETPAIR 1 - - /* Define to 1 if you have the <spawn.h> header file. */ --#define HAVE_SPAWN_H 1 -+/* #undef HAVE_SPAWN_H */ - - /* Define if your compiler provides ssize_t */ - #define HAVE_SSIZE_T 1 -@@ -654,10 +654,10 @@ - #define HAVE_STATVFS 1 - - /* Define if you have struct stat.st_mtim.tv_nsec */ --/* #undef HAVE_STAT_TV_NSEC */ -+#define HAVE_STAT_TV_NSEC 1 - - /* Define if you have struct stat.st_mtimensec */ --#define HAVE_STAT_TV_NSEC2 1 -+/* #undef HAVE_STAT_TV_NSEC2 */ - - /* Define if your compiler supports variable length function prototypes (e.g. - void fprintf(FILE *, char *, ...);) *and* <stdarg.h> */ -@@ -694,10 +694,10 @@ - #define HAVE_STRUCT_STAT_ST_BLOCKS 1 - - /* Define to 1 if `st_flags' is a member of `struct stat'. */ --#define HAVE_STRUCT_STAT_ST_FLAGS 1 -+/* #undef HAVE_STRUCT_STAT_ST_FLAGS */ - - /* Define to 1 if `st_gen' is a member of `struct stat'. */ --#define HAVE_STRUCT_STAT_ST_GEN 1 -+/* #undef HAVE_STRUCT_STAT_ST_GEN */ - - /* Define to 1 if `st_rdev' is a member of `struct stat'. */ - #define HAVE_STRUCT_STAT_ST_RDEV 1 -@@ -729,10 +729,10 @@ - /* #undef HAVE_SYS_DIR_H */ - - /* Define to 1 if you have the <sys/epoll.h> header file. */ --/* #undef HAVE_SYS_EPOLL_H */ -+#define HAVE_SYS_EPOLL_H 1 - - /* Define to 1 if you have the <sys/event.h> header file. */ --#define HAVE_SYS_EVENT_H 1 -+/* #undef HAVE_SYS_EVENT_H */ - - /* Define to 1 if you have the <sys/file.h> header file. */ - #define HAVE_SYS_FILE_H 1 -@@ -741,7 +741,7 @@ - /* #undef HAVE_SYS_LOADAVG_H */ - - /* Define to 1 if you have the <sys/lock.h> header file. */ --#define HAVE_SYS_LOCK_H 1 -+/* #undef HAVE_SYS_LOCK_H */ - - /* Define to 1 if you have the <sys/mkdev.h> header file. */ - /* #undef HAVE_SYS_MKDEV_H */ -@@ -829,7 +829,7 @@ - #define HAVE_TMPNAM 1 - - /* Define to 1 if you have the `tmpnam_r' function. */ --/* #undef HAVE_TMPNAM_R */ -+#define HAVE_TMPNAM_R 1 - - /* Define to 1 if your `struct tm' has `tm_zone'. Deprecated, use - `HAVE_STRUCT_TM_TM_ZONE' instead. */ -@@ -863,7 +863,7 @@ - /* #undef HAVE_USABLE_WCHAR_T */ - - /* Define to 1 if you have the <util.h> header file. */ --#define HAVE_UTIL_H 1 -+/* #undef HAVE_UTIL_H */ - - /* Define to 1 if you have the `utimes' function. */ - #define HAVE_UTIMES 1 -@@ -888,7 +888,7 @@ - - /* Define if tzset() actually switches the local timezone in a meaningful way. - */ --#define HAVE_WORKING_TZSET 1 -+/* #undef HAVE_WORKING_TZSET */ - - /* Define if the zlib library has inflateCopy */ - #define HAVE_ZLIB_COPY 1 -@@ -953,7 +953,7 @@ - /* #undef Py_DEBUG */ - - /* Defined if Python is built as a shared library. */ --/* #undef Py_ENABLE_SHARED */ -+#define Py_ENABLE_SHARED 1 - - /* Define as the size of the unicode type. */ - #define Py_UNICODE_SIZE 2 -@@ -980,16 +980,16 @@ - #define SIZEOF_FLOAT 4 - - /* The size of `fpos_t', as computed by sizeof. */ --#define SIZEOF_FPOS_T 8 -+#define SIZEOF_FPOS_T 20 - - /* The size of `int', as computed by sizeof. */ - #define SIZEOF_INT 4 - - /* The size of `long', as computed by sizeof. */ --#define SIZEOF_LONG 8 -+#define SIZEOF_LONG 4 - - /* The size of `long double', as computed by sizeof. */ --#define SIZEOF_LONG_DOUBLE 16 -+#define SIZEOF_LONG_DOUBLE 12 - - /* The size of `long long', as computed by sizeof. */ - #define SIZEOF_LONG_LONG 8 -@@ -1001,22 +1001,22 @@ - #define SIZEOF_PID_T 4 - - /* The size of `pthread_t', as computed by sizeof. */ --#define SIZEOF_PTHREAD_T 8 -+#define SIZEOF_PTHREAD_T 4 - - /* The size of `short', as computed by sizeof. */ - #define SIZEOF_SHORT 2 - - /* The size of `size_t', as computed by sizeof. */ --#define SIZEOF_SIZE_T 8 -+#define SIZEOF_SIZE_T 4 - - /* The size of `time_t', as computed by sizeof. */ --#define SIZEOF_TIME_T 8 -+#define SIZEOF_TIME_T 4 - - /* The size of `uintptr_t', as computed by sizeof. */ --#define SIZEOF_UINTPTR_T 8 -+#define SIZEOF_UINTPTR_T 4 - - /* The size of `void *', as computed by sizeof. */ --#define SIZEOF_VOID_P 8 -+#define SIZEOF_VOID_P 4 - - /* The size of `wchar_t', as computed by sizeof. */ - #define SIZEOF_WCHAR_T 4 -@@ -1032,7 +1032,7 @@ - #define SYS_SELECT_WITH_SYS_TIME 1 - - /* Define if tanh(-0.) is -0., or if platform doesn't have signed zeros */ --#define TANH_PRESERVES_ZERO_SIGN 1 -+/* #undef TANH_PRESERVES_ZERO_SIGN */ - - /* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */ - #define TIME_WITH_SYS_TIME 1 -@@ -1063,10 +1063,10 @@ - - - /* Define if you want to use MacPython modules on MacOSX in unix-Python. */ --#define USE_TOOLBOX_OBJECT_GLUE 1 -+/* #undef USE_TOOLBOX_OBJECT_GLUE */ - - /* Define if a va_list is an array of some kind */ --#define VA_LIST_IS_ARRAY 1 -+/* #undef VA_LIST_IS_ARRAY */ - - /* Define if you want SIGFPE handled (see Include/pyfpe.h). */ - /* #undef WANT_SIGFPE_HANDLER */ -@@ -1076,7 +1076,7 @@ - /* #undef WANT_WCTYPE_FUNCTIONS */ - - /* Define if WINDOW in curses.h offers a field _flags. */ --/* #undef WINDOW_HAS_FLAGS */ -+#define WINDOW_HAS_FLAGS 1 - - /* Define if you want documentation strings in extension modules */ - #define WITH_DOC_STRINGS 1 -@@ -1084,10 +1084,10 @@ - /* Define if you want to use the new-style (Openstep, Rhapsody, MacOS) dynamic - linker (dyld) instead of the old-style (NextStep) dynamic linker (rld). - Dyld is necessary to support frameworks. */ --#define WITH_DYLD 1 -+/* #undef WITH_DYLD */ - - /* Define to 1 if libintl is needed for locale functions. */ --/* #undef WITH_LIBINTL */ -+#define WITH_LIBINTL 1 - - /* Define if you want to produce an OpenStep/Rhapsody framework (shared - library plus accessory files). */ -@@ -1097,7 +1097,7 @@ - #define WITH_PYMALLOC 1 - - /* Define if you want to compile in rudimentary thread support */ --/* #undef WITH_THREAD */ -+#define WITH_THREAD 1 - - /* Define to profile with the Pentium timestamp counter */ - /* #undef WITH_TSC */ -@@ -1152,7 +1152,7 @@ - /* #undef _POSIX_1_SOURCE */ - - /* Define to activate features from IEEE Stds 1003.1-2001 */ --/* #undef _POSIX_C_SOURCE */ -+#define _POSIX_C_SOURCE 200112L - - /* Define to 1 if you need to in order for `stat' and other things to work. */ - /* #undef _POSIX_SOURCE */ -@@ -1161,7 +1161,7 @@ - /* #undef _POSIX_THREADS */ - - /* Define to force use of thread-safe errno, h_errno, and other functions */ --/* #undef _REENTRANT */ -+#define _REENTRANT 1 - - /* Define for Solaris 2.5.1 so the uint32_t typedef from <sys/synch.h>, - <pthread.h>, or <semaphore.h> is not used. If the typedef were allowed, the -@@ -1174,10 +1174,10 @@ - /* #undef _UINT64_T */ - - /* Define to the level of X/Open that your system supports */ --/* #undef _XOPEN_SOURCE */ -+#define _XOPEN_SOURCE 600 - - /* Define to activate Unix95-and-earlier features */ --/* #undef _XOPEN_SOURCE_EXTENDED */ -+#define _XOPEN_SOURCE_EXTENDED 1 - - /* Define on FreeBSD to activate all library features */ - #define __BSD_VISIBLE 1 diff --git a/package/qemu/Makefile b/package/qemu/Makefile index 1bafddc94..4b8c33c9c 100644 --- a/package/qemu/Makefile +++ b/package/qemu/Makefile @@ -5,11 +5,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:= qemu PKG_VERSION:= 0.13.0 -PKG_RELEASE:= 1 +PKG_RELEASE:= 2 PKG_MD5SUM:= 397a0d665da8ba9d3b9583629f3d6421 PKG_DESCR:= cpu and system emulator PKG_SECTION:= misc -PKG_BUILDDEP:= zlib +PKG_DEPENDS:= zlib libSDL +PKG_BUILDDEP:= zlib sdl PKG_URL:= http://wwww.qemu.org/ PKG_SITES:= http://wiki.qemu.org/download/ @@ -24,10 +25,14 @@ CONFIGURE_ARGS+= --host-cc=$(HOSTCC) \ --prefix=/usr \ --sysconfdir=/etc \ --bindir=/usr/bin +TLDFLAGS+= -pthread -lrt post-install: + $(INSTALL_DIR) $(IDIR_QEMU)/usr/share/qemu $(INSTALL_DIR) $(IDIR_QEMU)/usr/bin $(INSTALL_BIN) $(WRKINST)/usr/bin/qemu* \ $(IDIR_QEMU)/usr/bin + $(CP) $(WRKINST)/usr/share/qemu/* \ + $(IDIR_QEMU)/usr/share/qemu include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/qemu/patches/patch-configure b/package/qemu/patches/patch-configure new file mode 100644 index 000000000..963c407fe --- /dev/null +++ b/package/qemu/patches/patch-configure @@ -0,0 +1,11 @@ +--- qemu-0.13.0.orig/configure 2010-10-15 22:56:09.000000000 +0200 ++++ qemu-0.13.0/configure 2011-01-12 22:34:59.000000000 +0100 +@@ -136,7 +136,7 @@ QEMU_CFLAGS="-D_FORTIFY_SOURCE=2 $QEMU_C + QEMU_CFLAGS="-I. -I\$(SRC_PATH) $QEMU_CFLAGS" + LDFLAGS="-g $LDFLAGS" + +-gcc_flags="-Wold-style-declaration -Wold-style-definition -fstack-protector-all" ++gcc_flags="-Wold-style-declaration -Wold-style-definition" + cat > $TMPC << EOF + int main(void) { return 0; } + EOF diff --git a/package/qemu/patches/patch-hw_vhost_c b/package/qemu/patches/patch-hw_vhost_c new file mode 100644 index 000000000..71eccb83f --- /dev/null +++ b/package/qemu/patches/patch-hw_vhost_c @@ -0,0 +1,10 @@ +--- qemu-0.13.0.orig/hw/vhost.c 2010-10-15 22:56:09.000000000 +0200 ++++ qemu-0.13.0/hw/vhost.c 2011-01-12 21:27:10.000000000 +0100 +@@ -11,7 +11,6 @@ + */ + + #include <sys/ioctl.h> +-#include <sys/eventfd.h> + #include "vhost.h" + #include "hw/hw.h" + /* For range_get_last */ diff --git a/package/qemu/patches/patch-hw_vhost_net_c b/package/qemu/patches/patch-hw_vhost_net_c new file mode 100644 index 000000000..325d5a940 --- /dev/null +++ b/package/qemu/patches/patch-hw_vhost_net_c @@ -0,0 +1,10 @@ +--- qemu-0.13.0.orig/hw/vhost_net.c 2010-10-15 22:56:09.000000000 +0200 ++++ qemu-0.13.0/hw/vhost_net.c 2011-01-12 21:27:20.000000000 +0100 +@@ -20,7 +20,6 @@ + + #ifdef CONFIG_VHOST_NET + #include <linux/vhost.h> +-#include <sys/eventfd.h> + #include <sys/socket.h> + #include <linux/kvm.h> + #include <fcntl.h> diff --git a/package/qingy/patches/patch-ltmain_sh b/package/qingy/patches/patch-ltmain_sh new file mode 100644 index 000000000..a3cf5ff9b --- /dev/null +++ b/package/qingy/patches/patch-ltmain_sh @@ -0,0 +1,11 @@ +--- qingy-1.0.0.orig/ltmain.sh 2008-07-08 17:15:32.000000000 +0200 ++++ qingy-1.0.0/ltmain.sh 2011-01-16 22:03:22.000000000 +0100 +@@ -1690,7 +1690,7 @@ EOF + # -F/path gives path to uninstalled frameworks, gcc on darwin + # @file GCC response files + -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) + + # Unknown arguments in both finalize_command and compile_command need + # to be aesthetically quoted because they are evaled later. diff --git a/package/quagga/Makefile b/package/quagga/Makefile index b13c3b197..ee519da73 100644 --- a/package/quagga/Makefile +++ b/package/quagga/Makefile @@ -23,7 +23,7 @@ PKGSD_QUAGGA_RIPNGD:= RIPng daemon PKGSD_QUAGGA_RIPD:= RIP daemon PKGSD_QUAGGA_VTYSH:= vtysh utility -PKG_FLAVOURS:= WITH_IPV6 +PKG_FLAVOURS_QUAGGA:= WITH_IPV6 PKGFD_WITH_IPV6:= enable IPv6 support include ${TOPDIR}/mk/package.mk diff --git a/package/quagga/patches/patch-ltmain_sh b/package/quagga/patches/patch-ltmain_sh new file mode 100644 index 000000000..c6711472d --- /dev/null +++ b/package/quagga/patches/patch-ltmain_sh @@ -0,0 +1,11 @@ +--- quagga-0.99.17.orig/ltmain.sh 2010-08-19 11:43:02.000000000 +0200 ++++ quagga-0.99.17/ltmain.sh 2011-01-16 22:05:52.000000000 +0100 +@@ -4765,7 +4765,7 @@ func_mode_link () + # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC + # @file GCC response files + -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) + func_quote_for_eval "$arg" + arg="$func_quote_for_eval_result" + func_append compile_command " $arg" diff --git a/package/quagga/patches/patch-redhat_quagga_spec b/package/quagga/patches/patch-redhat_quagga_spec new file mode 100644 index 000000000..bf00ca130 --- /dev/null +++ b/package/quagga/patches/patch-redhat_quagga_spec @@ -0,0 +1,11 @@ +--- quagga-0.99.17.orig/redhat/quagga.spec 2010-08-19 11:44:45.000000000 +0200 ++++ quagga-0.99.17/redhat/quagga.spec 2011-01-16 22:05:02.000000000 +0100 +@@ -90,7 +90,7 @@ + Summary: Routing daemon + Name: quagga + Version: 0.99.17 +-Release: 20100819%{release_rev} ++Release: 20110116%{release_rev} + License: GPL + Group: System Environment/Daemons + Source0: http://www.quagga.net/snapshots/cvs/%{name}-%{version}.tar.gz diff --git a/package/quagga/patches/patch-vtysh_extract_pl b/package/quagga/patches/patch-vtysh_extract_pl new file mode 100644 index 000000000..dc3229fd2 --- /dev/null +++ b/package/quagga/patches/patch-vtysh_extract_pl @@ -0,0 +1,8 @@ +--- quagga-0.99.17.orig/vtysh/extract.pl 2010-08-19 11:44:45.000000000 +0200 ++++ quagga-0.99.17/vtysh/extract.pl 2011-01-16 22:05:03.000000000 +0100 +@@ -1,4 +1,4 @@ +-#! ++#! /opt/local/bin/perl + ## + ## vtysh/extract.pl. Generated from extract.pl.in by configure. + ## diff --git a/package/rp-pppoe/patches/patch-src_Makefile_in b/package/rp-pppoe/patches/patch-src_Makefile_in new file mode 100644 index 000000000..448dfe540 --- /dev/null +++ b/package/rp-pppoe/patches/patch-src_Makefile_in @@ -0,0 +1,32 @@ +--- rp-pppoe-3.10.orig/src/Makefile.in 2008-06-30 16:00:42.000000000 +0200 ++++ rp-pppoe-3.10/src/Makefile.in 2011-01-16 22:17:53.000000000 +0100 +@@ -67,16 +67,16 @@ all: $(TARGETS) + @echo "Type 'make install' as root to install the software." + + pppoe-sniff: pppoe-sniff.o if.o common.o debug.o +- @CC@ -o pppoe-sniff pppoe-sniff.o if.o common.o debug.o ++ @CC@ $(LDFLAGS) -o pppoe-sniff pppoe-sniff.o if.o common.o debug.o + + pppoe-server: pppoe-server.o if.o debug.o common.o md5.o libevent/libevent.a @PPPOE_SERVER_DEPS@ +- @CC@ -o pppoe-server @RDYNAMIC@ pppoe-server.o if.o debug.o common.o md5.o $(PPPOE_SERVER_LIBS) -Llibevent -levent ++ @CC@ $(LDFLAGS) -o pppoe-server @RDYNAMIC@ pppoe-server.o if.o debug.o common.o md5.o $(PPPOE_SERVER_LIBS) ./libevent/libevent.a + + pppoe: pppoe.o if.o debug.o common.o ppp.o discovery.o +- @CC@ -o pppoe pppoe.o if.o debug.o common.o ppp.o discovery.o ++ @CC@ $(LDFLAGS) -o pppoe pppoe.o if.o debug.o common.o ppp.o discovery.o + + pppoe-relay: relay.o if.o debug.o common.o +- @CC@ -o pppoe-relay relay.o if.o debug.o common.o ++ @CC@ $(LDFLAGS) -o pppoe-relay relay.o if.o debug.o common.o + + pppoe.o: pppoe.c pppoe.h + @CC@ $(CFLAGS) '-DVERSION="$(VERSION)"' -c -o pppoe.o pppoe.c +@@ -113,7 +113,7 @@ relay.o: relay.c relay.h pppoe.h + + # Linux-specific plugin + rp-pppoe.so: plugin/libplugin.a plugin/plugin.o +- @CC@ -o rp-pppoe.so -shared plugin/plugin.o plugin/libplugin.a ++ @CC@ $(LDFLAGS) -o rp-pppoe.so -shared plugin/plugin.o plugin/libplugin.a + + plugin/plugin.o: plugin.c + @CC@ '-DRP_VERSION="$(VERSION)"' $(CFLAGS) -I$(PPPD_INCDIR) -c -o plugin/plugin.o -fPIC plugin.c 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/rrdtool/patches/patch-ltmain_sh b/package/rrdtool/patches/patch-ltmain_sh new file mode 100644 index 000000000..940e4a403 --- /dev/null +++ b/package/rrdtool/patches/patch-ltmain_sh @@ -0,0 +1,11 @@ +--- rrdtool-1.2.30.orig/ltmain.sh 2007-03-14 16:47:55.000000000 +0100 ++++ rrdtool-1.2.30/ltmain.sh 2011-01-16 22:22:28.000000000 +0100 +@@ -1623,7 +1623,7 @@ EOF + # -pg pass through profiling flag for GCC + # @file GCC response files + -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*|-pg| \ +- -t[45]*|-txscale*|@*) ++ -t[45]*|-txscale*|@*|-fstack-protector*|-flto) + + # Unknown arguments in both finalize_command and compile_command need + # to be aesthetically quoted because they are evaled later. 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/rtsp/Makefile b/package/rtsp/Makefile index ec5bb1d91..bc11f10a0 100644 --- a/package/rtsp/Makefile +++ b/package/rtsp/Makefile @@ -15,7 +15,7 @@ NO_DISTFILES:= 1 include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,KMOD_RTSP,kmod-rtsp,${KERNEL_VERSION}-${ADK_TARGET}-${PKG_RELEASE},,${PKG_DESCR},${PKG_SECTION})) +$(eval $(call PKG_template,RTSP_KMOD,rtsp-kmod,${KERNEL_VERSION}-${ADK_TARGET}-${PKG_RELEASE},,${PKG_DESCR},${PKG_SECTION})) CONFIG_STYLE:= manual BUILD_STYLE:= manual @@ -28,11 +28,11 @@ pre-build: $(MAKE) -C ${WRKBUILD} debug V=1 do-install: - ${INSTALL_DIR} ${IDIR_KMOD_RTSP}/etc/modules.d/ - echo "nf_conntrack_rtsp" > ${IDIR_KMOD_RTSP}/etc/modules.d/60-nf-nat-rtsp - echo "nf_nat_rtsp" >> ${IDIR_KMOD_RTSP}/etc/modules.d/60-nf-nat-rtsp - ${INSTALL_DIR} ${IDIR_KMOD_RTSP}/lib/modules/${KERNEL_VERSION}/ + ${INSTALL_DIR} ${IDIR_RTSP_KMOD}/etc/modules.d/ + echo "nf_conntrack_rtsp" > ${IDIR_RTSP_KMOD}/etc/modules.d/60-nf-nat-rtsp + echo "nf_nat_rtsp" >> ${IDIR_RTSP_KMOD}/etc/modules.d/60-nf-nat-rtsp + ${INSTALL_DIR} ${IDIR_RTSP_KMOD}/lib/modules/${KERNEL_VERSION}/ ${INSTALL_DATA} ${WRKBUILD}/*.ko \ - ${IDIR_KMOD_RTSP}/lib/modules/${KERNEL_VERSION} + ${IDIR_RTSP_KMOD}/lib/modules/${KERNEL_VERSION} include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/ruby/Makefile b/package/ruby/Makefile index 8f225a847..e85a609c0 100644 --- a/package/ruby/Makefile +++ b/package/ruby/Makefile @@ -23,7 +23,8 @@ include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,RUBY,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) MAKE_FILE:= GNUmakefile -XAKE_FLAGS+= optflags='' debugflags='' BASERUBY="${WRKBUILD}/hostruby" +XAKE_FLAGS+= optflags='' debugflags='' BASERUBY="${WRKBUILD}/hostruby" \ + dldflags="$(TARGET_LDFLAGS)" # uClibc setpgrp does not take arguments CONFIGURE_ENV+= ac_cv_func_setpgrp_void=yes CONFIGURE_ARGS+= --disable-install-doc diff --git a/package/ruby/patches/patch-Makefile_in b/package/ruby/patches/patch-Makefile_in new file mode 100644 index 000000000..e97548bc2 --- /dev/null +++ b/package/ruby/patches/patch-Makefile_in @@ -0,0 +1,11 @@ +--- ruby-1.9.2-p0.orig/Makefile.in 2010-07-11 08:15:13.000000000 +0200 ++++ ruby-1.9.2-p0/Makefile.in 2011-01-16 22:34:17.000000000 +0100 +@@ -157,7 +157,7 @@ $(LIBRUBY_A): + + $(LIBRUBY_SO): + @-$(PRE_LIBRUBY_UPDATE) +- $(LDSHARED) $(DLDFLAGS) $(OBJS) $(DLDOBJS) $(SOLIBS) $(OUTFLAG)$@ ++ $(LDSHARED) $(LDFLAGS) $(DLDFLAGS) $(OBJS) $(DLDOBJS) $(SOLIBS) $(OUTFLAG)$@ + -$(OBJCOPY) -w -L '@EXPORT_PREFIX@Init_*' -L '@EXPORT_PREFIX@*_threadptr_*' $@ + @-$(MINIRUBY) -e 'ARGV.each{|link| File.delete link if File.exist? link; \ + File.symlink "$(LIBRUBY_SO)", link}' \ diff --git a/package/sane-backends/patches/patch-ltmain_sh b/package/sane-backends/patches/patch-ltmain_sh new file mode 100644 index 000000000..46c089aa5 --- /dev/null +++ b/package/sane-backends/patches/patch-ltmain_sh @@ -0,0 +1,11 @@ +--- sane-backends-1.0.20.orig/ltmain.sh 2009-02-10 22:41:47.000000000 +0100 ++++ sane-backends-1.0.20/ltmain.sh 2011-01-17 11:25:40.000000000 +0100 +@@ -1680,7 +1680,7 @@ EOF + # -F/path gives path to uninstalled frameworks, gcc on darwin + # @file GCC response files + -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) + + # Unknown arguments in both finalize_command and compile_command need + # to be aesthetically quoted because they are evaled later. 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/scanlogd/Makefile b/package/scanlogd/Makefile index bc2d80e68..ef939a1f1 100644 --- a/package/scanlogd/Makefile +++ b/package/scanlogd/Makefile @@ -21,10 +21,7 @@ $(eval $(call PKG_template,SCANLOGD,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${ CONFIG_STYLE:= manual INSTALL_STYLE:= manual -MAKE_FLAGS+= CC="${TARGET_CC}" LD="${TARGET_CC}" \ - CFLAGS="-c ${TARGET_CFLAGS}" \ - LDFLAGS= \ - PCAP_H="-I${STAGING_TARGET_DIR}/usr/include" \ +MAKE_FLAGS+= PCAP_H="-I${STAGING_TARGET_DIR}/usr/include" \ NIDS_H="-I${STAGING_TARGET_DIR}/usr/include" \ NIDS_L="-L${STAGING_TARGET_DIR}/usr/lib -lnids -lnet -lpcap" ALL_TARGET:= libnids diff --git a/package/scanlogd/patches/patch-Makefile b/package/scanlogd/patches/patch-Makefile new file mode 100644 index 000000000..a2a239302 --- /dev/null +++ b/package/scanlogd/patches/patch-Makefile @@ -0,0 +1,14 @@ +--- scanlogd-2.2.6.orig/Makefile 2006-03-05 11:03:15.000000000 +0100 ++++ scanlogd-2.2.6/Makefile 2011-01-17 12:03:48.000000000 +0100 +@@ -1,8 +1,8 @@ +-CC = gcc ++CC ?= gcc + LD = $(CC) + RM = rm -f +-CFLAGS = -Wall -O2 -fomit-frame-pointer +-LDFLAGS = -s ++CFLAGS ?= -Wall -O2 -fomit-frame-pointer ++LDFLAGS ?= -s + + PCAP_H = -I/usr/include/pcap + PCAP_L = -lpcap diff --git a/package/scanlogd/patches/patch-params_h b/package/scanlogd/patches/patch-params_h new file mode 100644 index 000000000..b649c8f8d --- /dev/null +++ b/package/scanlogd/patches/patch-params_h @@ -0,0 +1,20 @@ +--- scanlogd-2.2.6.orig/params.h 2006-03-05 11:13:56.000000000 +0100 ++++ scanlogd-2.2.6/params.h 2011-01-17 11:35:06.000000000 +0100 +@@ -19,7 +19,7 @@ + * An empty directory to chroot to. The directory and its parent directories + * must not be writable by anyone but root. + */ +-#define SCANLOGD_CHROOT "/var/empty" ++#define SCANLOGD_CHROOT "/tmp/.scanlogd" + + /* + * Device to monitor, if you're using libnids or libpcap directly. #undef +@@ -29,7 +29,7 @@ + * Recent versions of libpcap support magic device name "any" and recent + * libnids supports magic device name "all". + */ +-#undef SCANLOGD_DEVICE ++#define SCANLOGD_DEVICE "all" + + /* + * Whether we want scanlogd to set the device into promiscuous mode, for 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-image/patches/patch-ltmain_sh b/package/sdl-image/patches/patch-ltmain_sh new file mode 100644 index 000000000..a7eae68fe --- /dev/null +++ b/package/sdl-image/patches/patch-ltmain_sh @@ -0,0 +1,11 @@ +--- SDL_image-1.2.10.orig/ltmain.sh 2009-10-13 01:06:51.000000000 +0200 ++++ SDL_image-1.2.10/ltmain.sh 2011-01-17 12:10:39.000000000 +0100 +@@ -4766,7 +4766,7 @@ func_mode_link () + # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC + # @file GCC response files + -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) + func_quote_for_eval "$arg" + arg="$func_quote_for_eval_result" + func_append compile_command " $arg" diff --git a/package/sdl/Makefile b/package/sdl/Makefile index 9fb10463a..277be34b7 100644 --- a/package/sdl/Makefile +++ b/package/sdl/Makefile @@ -9,11 +9,16 @@ PKG_RELEASE:= 1 PKG_MD5SUM:= e52086d1b508fa0b76c52ee30b55bec4 PKG_DESCR:= Simple DirectMedia Layer PKG_SECTION:= libs -PKG_DEPENDS:= libusb alsa-lib libpthread tslib -PKG_BUILDDEP:= libusb alsa-lib tslib +PKG_DEPENDS:= libusb alsa-lib libpthread libx11 libxext +PKG_BUILDDEP:= libusb alsa-lib libX11 libXext PKG_URL:= http://www.libsdl.org/ PKG_SITES:= http://www.libsdl.org/release/ +PKG_FLAVOURS_LIBSDL:= WITH_TSLIB +PKGFD_WITH_TSLIB:= SDL with touchscreen support +PKGFS_WITH_TSLIB:= tslib +PKGFB_WITH_TSLIB:= tslib + PKG_SUBPKGS:= LIBSDL LIBSDL_DEV PKGSD_LIBSDL_DEV:= development files for libsdl PKGSC_LIBSDL_DEV:= devel @@ -26,20 +31,18 @@ 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 - +ifeq ($(ADK_PACKAGE_SDL_WITH_TSLIB),y) +CONFIGURE_ARGS+= --enable-input-tslib +endif CONFIGURE_ARGS+= --disable-esd \ --disable-oss \ --enable-alsa \ --enable-video-fbcon \ --disable-video-directfb \ --disable-video-opengl \ - --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/sdl/patches/patch-build-scripts_ltmain_sh b/package/sdl/patches/patch-build-scripts_ltmain_sh new file mode 100644 index 000000000..c2f950420 --- /dev/null +++ b/package/sdl/patches/patch-build-scripts_ltmain_sh @@ -0,0 +1,11 @@ +--- SDL-1.2.14.orig/build-scripts/ltmain.sh 2009-10-13 01:07:12.000000000 +0200 ++++ SDL-1.2.14/build-scripts/ltmain.sh 2011-01-14 23:31:20.000000000 +0100 +@@ -4766,7 +4766,7 @@ func_mode_link () + # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC + # @file GCC response files + -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) + func_quote_for_eval "$arg" + arg="$func_quote_for_eval_result" + func_append compile_command " $arg" diff --git a/package/sdl/patches/patch-include_SDL_config_h b/package/sdl/patches/patch-include_SDL_config_h new file mode 100644 index 000000000..371f7199f --- /dev/null +++ b/package/sdl/patches/patch-include_SDL_config_h @@ -0,0 +1,311 @@ +--- SDL-1.2.14.orig/include/SDL_config.h 2009-10-19 13:51:07.000000000 +0200 ++++ SDL-1.2.14/include/SDL_config.h 2011-01-12 11:57:30.000000000 +0100 +@@ -1,3 +1,4 @@ ++/* include/SDL_config.h. Generated from SDL_config.h.in by configure. */ + /* + SDL - Simple DirectMedia Layer + Copyright (C) 1997-2009 Sam Lantinga +@@ -23,23 +24,288 @@ + #ifndef _SDL_config_h + #define _SDL_config_h + ++/* This is a set of defines to configure the SDL features */ ++ ++/* General platform specific identifiers */ + #include "SDL_platform.h" + +-/* Add any platform that doesn't build using the configure system */ +-#if defined(__DREAMCAST__) +-#include "SDL_config_dreamcast.h" +-#elif defined(__MACOS__) +-#include "SDL_config_macos.h" +-#elif defined(__MACOSX__) +-#include "SDL_config_macosx.h" +-#elif defined(__SYMBIAN32__) +-#include "SDL_config_symbian.h" /* must be before win32! */ +-#elif defined(__WIN32__) +-#include "SDL_config_win32.h" +-#elif defined(__OS2__) +-#include "SDL_config_os2.h" ++/* Make sure that this isn't included by Visual C++ */ ++#ifdef _MSC_VER ++#error You should copy include/SDL_config.h.default to include/SDL_config.h ++#endif ++ ++/* C language features */ ++/* #undef const */ ++/* #undef inline */ ++/* #undef volatile */ ++ ++/* C datatypes */ ++/* #undef size_t */ ++/* #undef int8_t */ ++/* #undef uint8_t */ ++/* #undef int16_t */ ++/* #undef uint16_t */ ++/* #undef int32_t */ ++/* #undef uint32_t */ ++/* #undef int64_t */ ++/* #undef uint64_t */ ++/* #undef uintptr_t */ ++#define SDL_HAS_64BIT_TYPE 1 ++ ++/* Endianness */ ++#define SDL_BYTEORDER 1234 ++ ++/* Comment this if you want to build without any C library requirements */ ++#define HAVE_LIBC 1 ++#if HAVE_LIBC ++ ++/* Useful headers */ ++#define HAVE_ALLOCA_H 1 ++#define HAVE_SYS_TYPES_H 1 ++#define HAVE_STDIO_H 1 ++#define STDC_HEADERS 1 ++#define HAVE_STDLIB_H 1 ++#define HAVE_STDARG_H 1 ++#define HAVE_MALLOC_H 1 ++#define HAVE_MEMORY_H 1 ++#define HAVE_STRING_H 1 ++#define HAVE_STRINGS_H 1 ++#define HAVE_INTTYPES_H 1 ++#define HAVE_STDINT_H 1 ++#define HAVE_CTYPE_H 1 ++#define HAVE_MATH_H 1 ++#define HAVE_ICONV_H 1 ++#define HAVE_SIGNAL_H 1 ++/* #undef HAVE_ALTIVEC_H */ ++ ++/* C library functions */ ++#define HAVE_MALLOC 1 ++#define HAVE_CALLOC 1 ++#define HAVE_REALLOC 1 ++#define HAVE_FREE 1 ++#define HAVE_ALLOCA 1 ++#ifndef _WIN32 /* Don't use C runtime versions of these on Windows */ ++#define HAVE_GETENV 1 ++#define HAVE_PUTENV 1 ++#define HAVE_UNSETENV 1 ++#endif ++#define HAVE_QSORT 1 ++#define HAVE_ABS 1 ++#define HAVE_BCOPY 1 ++#define HAVE_MEMSET 1 ++#define HAVE_MEMCPY 1 ++#define HAVE_MEMMOVE 1 ++/* #undef HAVE_MEMCMP */ ++#define HAVE_STRLEN 1 ++#define HAVE_STRLCPY 1 ++#define HAVE_STRLCAT 1 ++#define HAVE_STRDUP 1 ++/* #undef HAVE__STRREV */ ++/* #undef HAVE__STRUPR */ ++/* #undef HAVE__STRLWR */ ++/* #undef HAVE_INDEX */ ++/* #undef HAVE_RINDEX */ ++#define HAVE_STRCHR 1 ++#define HAVE_STRRCHR 1 ++#define HAVE_STRSTR 1 ++/* #undef HAVE_ITOA */ ++/* #undef HAVE__LTOA */ ++/* #undef HAVE__UITOA */ ++/* #undef HAVE__ULTOA */ ++#define HAVE_STRTOL 1 ++#define HAVE_STRTOUL 1 ++/* #undef HAVE__I64TOA */ ++/* #undef HAVE__UI64TOA */ ++#define HAVE_STRTOLL 1 ++#define HAVE_STRTOULL 1 ++/* #undef HAVE_STRTOD */ ++#define HAVE_ATOI 1 ++#define HAVE_ATOF 1 ++#define HAVE_STRCMP 1 ++#define HAVE_STRNCMP 1 ++/* #undef HAVE__STRICMP */ ++#define HAVE_STRCASECMP 1 ++/* #undef HAVE__STRNICMP */ ++#define HAVE_STRNCASECMP 1 ++#define HAVE_SSCANF 1 ++#define HAVE_SNPRINTF 1 ++#define HAVE_VSNPRINTF 1 ++/* #undef HAVE_ICONV */ ++#define HAVE_SIGACTION 1 ++#define HAVE_SETJMP 1 ++#define HAVE_NANOSLEEP 1 ++/* #undef HAVE_CLOCK_GETTIME */ ++#define HAVE_GETPAGESIZE 1 ++#define HAVE_MPROTECT 1 ++ + #else +-#include "SDL_config_minimal.h" +-#endif /* platform config */ ++/* We may need some replacement for stdarg.h here */ ++#include <stdarg.h> ++#endif /* HAVE_LIBC */ ++ ++/* Allow disabling of core subsystems */ ++/* #undef SDL_AUDIO_DISABLED */ ++/* #undef SDL_CDROM_DISABLED */ ++/* #undef SDL_CPUINFO_DISABLED */ ++/* #undef SDL_EVENTS_DISABLED */ ++/* #undef SDL_FILE_DISABLED */ ++/* #undef SDL_JOYSTICK_DISABLED */ ++/* #undef SDL_LOADSO_DISABLED */ ++/* #undef SDL_THREADS_DISABLED */ ++/* #undef SDL_TIMERS_DISABLED */ ++/* #undef SDL_VIDEO_DISABLED */ ++ ++/* Enable various audio drivers */ ++#define SDL_AUDIO_DRIVER_ALSA 1 ++#define SDL_AUDIO_DRIVER_ALSA_DYNAMIC "libasound.so.2" ++/* #undef SDL_AUDIO_DRIVER_ARTS */ ++/* #undef SDL_AUDIO_DRIVER_ARTS_DYNAMIC */ ++/* #undef SDL_AUDIO_DRIVER_BAUDIO */ ++/* #undef SDL_AUDIO_DRIVER_BSD */ ++/* #undef SDL_AUDIO_DRIVER_COREAUDIO */ ++/* #undef SDL_AUDIO_DRIVER_DART */ ++/* #undef SDL_AUDIO_DRIVER_DC */ ++#define SDL_AUDIO_DRIVER_DISK 1 ++#define SDL_AUDIO_DRIVER_DUMMY 1 ++/* #undef SDL_AUDIO_DRIVER_DMEDIA */ ++/* #undef SDL_AUDIO_DRIVER_DSOUND */ ++/* #undef SDL_AUDIO_DRIVER_PULSE */ ++/* #undef SDL_AUDIO_DRIVER_PULSE_DYNAMIC */ ++/* #undef SDL_AUDIO_DRIVER_ESD */ ++/* #undef SDL_AUDIO_DRIVER_ESD_DYNAMIC */ ++/* #undef SDL_AUDIO_DRIVER_MINT */ ++/* #undef SDL_AUDIO_DRIVER_MMEAUDIO */ ++/* #undef SDL_AUDIO_DRIVER_NAS */ ++/* #undef SDL_AUDIO_DRIVER_NAS_DYNAMIC */ ++/* #undef SDL_AUDIO_DRIVER_OSS */ ++/* #undef SDL_AUDIO_DRIVER_OSS_SOUNDCARD_H */ ++/* #undef SDL_AUDIO_DRIVER_PAUD */ ++/* #undef SDL_AUDIO_DRIVER_QNXNTO */ ++/* #undef SDL_AUDIO_DRIVER_SNDMGR */ ++/* #undef SDL_AUDIO_DRIVER_SUNAUDIO */ ++/* #undef SDL_AUDIO_DRIVER_WAVEOUT */ ++ ++/* Enable various cdrom drivers */ ++/* #undef SDL_CDROM_AIX */ ++/* #undef SDL_CDROM_BEOS */ ++/* #undef SDL_CDROM_BSDI */ ++/* #undef SDL_CDROM_DC */ ++/* #undef SDL_CDROM_DUMMY */ ++/* #undef SDL_CDROM_FREEBSD */ ++#define SDL_CDROM_LINUX 1 ++/* #undef SDL_CDROM_MACOS */ ++/* #undef SDL_CDROM_MACOSX */ ++/* #undef SDL_CDROM_MINT */ ++/* #undef SDL_CDROM_OPENBSD */ ++/* #undef SDL_CDROM_OS2 */ ++/* #undef SDL_CDROM_OSF */ ++/* #undef SDL_CDROM_QNX */ ++/* #undef SDL_CDROM_WIN32 */ ++ ++/* Enable various input drivers */ ++#define SDL_INPUT_LINUXEV 1 ++#define SDL_INPUT_TSLIB 1 ++/* #undef SDL_JOYSTICK_BEOS */ ++/* #undef SDL_JOYSTICK_DC */ ++/* #undef SDL_JOYSTICK_DUMMY */ ++/* #undef SDL_JOYSTICK_IOKIT */ ++#define SDL_JOYSTICK_LINUX 1 ++/* #undef SDL_JOYSTICK_MACOS */ ++/* #undef SDL_JOYSTICK_MINT */ ++/* #undef SDL_JOYSTICK_OS2 */ ++/* #undef SDL_JOYSTICK_RISCOS */ ++/* #undef SDL_JOYSTICK_WINMM */ ++/* #undef SDL_JOYSTICK_USBHID */ ++/* #undef SDL_JOYSTICK_USBHID_MACHINE_JOYSTICK_H */ ++ ++/* Enable various shared object loading systems */ ++/* #undef SDL_LOADSO_BEOS */ ++/* #undef SDL_LOADSO_DLCOMPAT */ ++#define SDL_LOADSO_DLOPEN 1 ++/* #undef SDL_LOADSO_DUMMY */ ++/* #undef SDL_LOADSO_LDG */ ++/* #undef SDL_LOADSO_MACOS */ ++/* #undef SDL_LOADSO_OS2 */ ++/* #undef SDL_LOADSO_WIN32 */ ++ ++/* Enable various threading systems */ ++/* #undef SDL_THREAD_BEOS */ ++/* #undef SDL_THREAD_DC */ ++/* #undef SDL_THREAD_OS2 */ ++/* #undef SDL_THREAD_PTH */ ++#define SDL_THREAD_PTHREAD 1 ++#define SDL_THREAD_PTHREAD_RECURSIVE_MUTEX 1 ++/* #undef SDL_THREAD_PTHREAD_RECURSIVE_MUTEX_NP */ ++/* #undef SDL_THREAD_SPROC */ ++/* #undef SDL_THREAD_WIN32 */ ++ ++/* Enable various timer systems */ ++/* #undef SDL_TIMER_BEOS */ ++/* #undef SDL_TIMER_DC */ ++/* #undef SDL_TIMER_DUMMY */ ++/* #undef SDL_TIMER_MACOS */ ++/* #undef SDL_TIMER_MINT */ ++/* #undef SDL_TIMER_OS2 */ ++/* #undef SDL_TIMER_RISCOS */ ++#define SDL_TIMER_UNIX 1 ++/* #undef SDL_TIMER_WIN32 */ ++/* #undef SDL_TIMER_WINCE */ ++ ++/* Enable various video drivers */ ++/* #undef SDL_VIDEO_DRIVER_AALIB */ ++/* #undef SDL_VIDEO_DRIVER_BWINDOW */ ++/* #undef SDL_VIDEO_DRIVER_CACA */ ++/* #undef SDL_VIDEO_DRIVER_DC */ ++/* #undef SDL_VIDEO_DRIVER_DDRAW */ ++#define SDL_VIDEO_DRIVER_DGA 1 ++/* #undef SDL_VIDEO_DRIVER_DIRECTFB */ ++/* #undef SDL_VIDEO_DRIVER_DRAWSPROCKET */ ++#define SDL_VIDEO_DRIVER_DUMMY 1 ++#define SDL_VIDEO_DRIVER_FBCON 1 ++/* #undef SDL_VIDEO_DRIVER_GAPI */ ++/* #undef SDL_VIDEO_DRIVER_GEM */ ++/* #undef SDL_VIDEO_DRIVER_GGI */ ++/* #undef SDL_VIDEO_DRIVER_IPOD */ ++/* #undef SDL_VIDEO_DRIVER_NANOX */ ++/* #undef SDL_VIDEO_DRIVER_OS2FS */ ++/* #undef SDL_VIDEO_DRIVER_PHOTON */ ++/* #undef SDL_VIDEO_DRIVER_PICOGUI */ ++/* #undef SDL_VIDEO_DRIVER_PS2GS */ ++/* #undef SDL_VIDEO_DRIVER_PS3 */ ++/* #undef SDL_VIDEO_DRIVER_QTOPIA */ ++/* #undef SDL_VIDEO_DRIVER_QUARTZ */ ++/* #undef SDL_VIDEO_DRIVER_RISCOS */ ++/* #undef SDL_VIDEO_DRIVER_SVGALIB */ ++/* #undef SDL_VIDEO_DRIVER_TOOLBOX */ ++/* #undef SDL_VIDEO_DRIVER_VGL */ ++/* #undef SDL_VIDEO_DRIVER_WINDIB */ ++/* #undef SDL_VIDEO_DRIVER_WSCONS */ ++#define SDL_VIDEO_DRIVER_X11 1 ++#define SDL_VIDEO_DRIVER_X11_DGAMOUSE 1 ++#define SDL_VIDEO_DRIVER_X11_DYNAMIC "libX11.so.6" ++#define SDL_VIDEO_DRIVER_X11_DYNAMIC_XEXT "libXext.so.6" ++/* #undef SDL_VIDEO_DRIVER_X11_DYNAMIC_XRANDR */ ++/* #undef SDL_VIDEO_DRIVER_X11_DYNAMIC_XRENDER */ ++#define SDL_VIDEO_DRIVER_X11_VIDMODE 1 ++#define SDL_VIDEO_DRIVER_X11_XINERAMA 1 ++#define SDL_VIDEO_DRIVER_X11_XME 1 ++/* #undef SDL_VIDEO_DRIVER_X11_XRANDR */ ++#define SDL_VIDEO_DRIVER_X11_XV 1 ++/* #undef SDL_VIDEO_DRIVER_XBIOS */ ++ ++/* Enable OpenGL support */ ++/* #undef SDL_VIDEO_OPENGL */ ++/* #undef SDL_VIDEO_OPENGL_GLX */ ++/* #undef SDL_VIDEO_OPENGL_WGL */ ++/* #undef SDL_VIDEO_OPENGL_OSMESA */ ++/* #undef SDL_VIDEO_OPENGL_OSMESA_DYNAMIC */ ++ ++/* Disable screensaver */ ++#define SDL_VIDEO_DISABLE_SCREENSAVER 1 ++ ++/* Enable assembly routines */ ++#define SDL_ASSEMBLY_ROUTINES 1 ++#define SDL_HERMES_BLITTERS 1 ++/* #undef SDL_ALTIVEC_BLITTERS */ + + #endif /* _SDL_config_h */ diff --git a/package/sdl/patches/patch-sdl-config_in b/package/sdl/patches/patch-sdl-config_in new file mode 100644 index 000000000..4d3de58ed --- /dev/null +++ b/package/sdl/patches/patch-sdl-config_in @@ -0,0 +1,16 @@ +--- SDL-1.2.14.orig/sdl-config.in 2009-10-13 01:07:20.000000000 +0200 ++++ SDL-1.2.14/sdl-config.in 2011-01-12 21:46:41.000000000 +0100 +@@ -45,11 +45,11 @@ while test $# -gt 0; do + echo -I@includedir@/SDL @SDL_CFLAGS@ + ;; + @ENABLE_SHARED_TRUE@ --libs) +-@ENABLE_SHARED_TRUE@ echo -L@libdir@ @SDL_RLD_FLAGS@ @SDL_LIBS@ ++@ENABLE_SHARED_TRUE@ echo @SDL_LIBS@ + @ENABLE_SHARED_TRUE@ ;; + @ENABLE_STATIC_TRUE@@ENABLE_SHARED_TRUE@ --static-libs) + @ENABLE_STATIC_TRUE@@ENABLE_SHARED_FALSE@ --libs|--static-libs) +-@ENABLE_STATIC_TRUE@ echo -L@libdir@ @SDL_RLD_FLAGS@ @SDL_STATIC_LIBS@ ++@ENABLE_STATIC_TRUE@ echo @SDL_STATIC_LIBS@ + @ENABLE_STATIC_TRUE@ ;; + *) + echo "${usage}" 1>&2 diff --git a/package/sdl/patches/patch-sdl_pc_in b/package/sdl/patches/patch-sdl_pc_in new file mode 100644 index 000000000..fd0ae8d52 --- /dev/null +++ b/package/sdl/patches/patch-sdl_pc_in @@ -0,0 +1,10 @@ +--- SDL-1.2.14.orig/sdl.pc.in 2009-10-13 01:07:20.000000000 +0200 ++++ SDL-1.2.14/sdl.pc.in 2011-01-12 21:54:44.000000000 +0100 +@@ -10,6 +10,6 @@ Description: Simple DirectMedia Layer is + Version: @SDL_VERSION@ + Requires: + Conflicts: +-Libs: -L${libdir} @SDL_RLD_FLAGS@ @SDL_LIBS@ ++Libs: @SDL_LIBS@ + Libs.private: @SDL_STATIC_LIBS@ + Cflags: -I${includedir}/SDL @SDL_CFLAGS@ diff --git a/package/siproxd/patches/patch-libltdl_ltmain_sh b/package/siproxd/patches/patch-libltdl_ltmain_sh new file mode 100644 index 000000000..84bfc305b --- /dev/null +++ b/package/siproxd/patches/patch-libltdl_ltmain_sh @@ -0,0 +1,11 @@ +--- siproxd-0.7.1.orig/libltdl/ltmain.sh 2008-02-02 18:16:31.000000000 +0100 ++++ siproxd-0.7.1/libltdl/ltmain.sh 2011-01-17 12:14:25.000000000 +0100 +@@ -1298,7 +1298,7 @@ EOF + # but this is not reliable with gcc because gcc may use -mfoo to + # select a different linker, different libraries, etc, while + # -Wl,-mfoo simply passes -mfoo to the linker. +- -m*) ++ -m*|-fstack-protector*|-flto) + # Unknown arguments in both finalize_command and compile_command need + # to be aesthetically quoted because they are evaled later. + arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"` diff --git a/package/siproxd/patches/patch-scripts_ltmain_sh b/package/siproxd/patches/patch-scripts_ltmain_sh new file mode 100644 index 000000000..79b49713d --- /dev/null +++ b/package/siproxd/patches/patch-scripts_ltmain_sh @@ -0,0 +1,11 @@ +--- siproxd-0.7.1.orig/scripts/ltmain.sh 2008-01-27 17:35:27.000000000 +0100 ++++ siproxd-0.7.1/scripts/ltmain.sh 2011-01-17 12:17:22.000000000 +0100 +@@ -1301,7 +1301,7 @@ EOF + # but this is not reliable with gcc because gcc may use -mfoo to + # select a different linker, different libraries, etc, while + # -Wl,-mfoo simply passes -mfoo to the linker. +- -m*) ++ -m*|-fstack-protector*|-flto) + # Unknown arguments in both finalize_command and compile_command need + # to be aesthetically quoted because they are evaled later. + arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"` diff --git a/package/snort/patches/patch-ltmain_sh b/package/snort/patches/patch-ltmain_sh new file mode 100644 index 000000000..09079e090 --- /dev/null +++ b/package/snort/patches/patch-ltmain_sh @@ -0,0 +1,11 @@ +--- snort-2.8.5.2.orig/ltmain.sh 2007-04-05 16:20:16.000000000 +0200 ++++ snort-2.8.5.2/ltmain.sh 2011-01-17 14:42:39.000000000 +0100 +@@ -1653,7 +1653,7 @@ EOF + # -pg pass through profiling flag for GCC + # @file GCC response files + -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*|-pg| \ +- -t[45]*|-txscale*|@*) ++ -t[45]*|-txscale*|@*|-fstack-protector*|-flto) + + # Unknown arguments in both finalize_command and compile_command need + # to be aesthetically quoted because they are evaled later. diff --git a/package/speex/patches/patch-ltmain_sh b/package/speex/patches/patch-ltmain_sh new file mode 100644 index 000000000..3bacdbcae --- /dev/null +++ b/package/speex/patches/patch-ltmain_sh @@ -0,0 +1,11 @@ +--- speex-1.2rc1.orig/ltmain.sh 2006-06-19 21:29:20.000000000 +0200 ++++ speex-1.2rc1/ltmain.sh 2011-01-14 12:16:15.000000000 +0100 +@@ -1623,7 +1623,7 @@ EOF + # -pg pass through profiling flag for GCC + # @file GCC response files + -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*|-pg| \ +- -t[45]*|-txscale*|@*) ++ -t[45]*|-txscale*|@*|-fstack-protector*|-flto) + + # Unknown arguments in both finalize_command and compile_command need + # to be aesthetically quoted because they are evaled later. diff --git a/package/sqlite/patches/patch-ltmain_sh b/package/sqlite/patches/patch-ltmain_sh new file mode 100644 index 000000000..7f7d44cb0 --- /dev/null +++ b/package/sqlite/patches/patch-ltmain_sh @@ -0,0 +1,11 @@ +--- sqlite-3.7.3.orig/ltmain.sh 2010-10-01 22:19:27.000000000 +0200 ++++ sqlite-3.7.3/ltmain.sh 2011-01-15 00:16:55.000000000 +0100 +@@ -4772,7 +4772,7 @@ func_mode_link () + # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC + # @file GCC response files + -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) + func_quote_for_eval "$arg" + arg="$func_quote_for_eval_result" + func_append compile_command " $arg" diff --git a/package/ssmtp/patches/901-strftime_space_padding.patch b/package/ssmtp/patches/901-strftime_space_padding.patch deleted file mode 100644 index dd0b9b116..000000000 --- a/package/ssmtp/patches/901-strftime_space_padding.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ruN ssmtp-2.60-old/arpadate.c ssmtp-2.60-new/arpadate.c ---- ssmtp-2.60-old/arpadate.c 2002-12-08 18:30:11.000000000 +0100 -+++ ssmtp-2.60-new/arpadate.c 2004-05-23 18:54:32.000000000 +0200 -@@ -79,7 +79,7 @@ - time_t now; - - /* RFC822 format string borrowed from GNU shellutils date.c */ -- const char *format = "%a, %_d %b %Y %H:%M:%S %z"; -+ const char *format = "%a, %d %b %Y %H:%M:%S %z"; - - now = time(NULL); - diff --git a/package/ssmtp/patches/patch-Makefile_in b/package/ssmtp/patches/patch-Makefile_in new file mode 100644 index 000000000..01150acf4 --- /dev/null +++ b/package/ssmtp/patches/patch-Makefile_in @@ -0,0 +1,11 @@ +--- ssmtp-2.61.orig/Makefile.in 2004-07-26 07:32:18.000000000 +0200 ++++ ssmtp-2.61/Makefile.in 2011-01-17 15:06:49.000000000 +0100 +@@ -79,7 +79,7 @@ uninstall-sendmail: uninstall + + # Binaries: + ssmtp: $(OBJS) +- $(CC) -o ssmtp $(OBJS) @LIBS@ ++ $(CC) @LDFLAGS@ -o ssmtp $(OBJS) @LIBS@ + + .PHONY: clean + clean: diff --git a/package/ssmtp/patches/patch-arpadate_c b/package/ssmtp/patches/patch-arpadate_c new file mode 100644 index 000000000..e753470f6 --- /dev/null +++ b/package/ssmtp/patches/patch-arpadate_c @@ -0,0 +1,11 @@ +--- ssmtp-2.61.orig/arpadate.c 2002-12-08 18:30:11.000000000 +0100 ++++ ssmtp-2.61/arpadate.c 2011-01-17 15:09:18.000000000 +0100 +@@ -79,7 +79,7 @@ get_arpadate (char *d_string) + time_t now; + + /* RFC822 format string borrowed from GNU shellutils date.c */ +- const char *format = "%a, %_d %b %Y %H:%M:%S %z"; ++ const char *format = "%a, %d %b %Y %H:%M:%S %z"; + + now = time(NULL); + diff --git a/package/ssmtp/patches/patch-configure_in b/package/ssmtp/patches/patch-configure_in new file mode 100644 index 000000000..274ae978e --- /dev/null +++ b/package/ssmtp/patches/patch-configure_in @@ -0,0 +1,13 @@ +--- ssmtp-2.61.orig/configure.in 2004-07-23 06:40:29.000000000 +0200 ++++ ssmtp-2.61/configure.in 2011-01-17 14:46:46.000000000 +0100 +@@ -24,8 +24,8 @@ AC_C_CONST + AC_STRUCT_TM + + dnl Checks for libraries. +-AC_CHECK_LIB(nsl, gethostname) +-AC_CHECK_LIB(socket, socket) ++AC_SEARCH_LIBS(gethostname, nsl) ++AC_SEARCH_LIBS(socket, socket) + + dnl Checks for library functions. + AC_TYPE_SIGNAL diff --git a/package/ssmtp/patches/500-debian-subset-2.61-2.patch b/package/ssmtp/patches/patch-ssmtp_c index f682c97a1..38d45ca3d 100644 --- a/package/ssmtp/patches/500-debian-subset-2.61-2.patch +++ b/package/ssmtp/patches/patch-ssmtp_c @@ -1,17 +1,6 @@ ---- ssmtp-2.61.orig/ssmtp.conf -+++ ssmtp-2.61/ssmtp.conf -@@ -36,3 +36,8 @@ - - # Use this RSA certificate. - #TLSCert=/etc/ssl/certs/ssmtp.pem -+ -+# Get enhanced (*really* enhanced) debugging information in the logs -+# If you want to have debugging of the config file parsing, move this option -+# to the top of the config file and uncomment -+#Debug=YES ---- ssmtp-2.61.orig/ssmtp.c -+++ ssmtp-2.61/ssmtp.c -@@ -93,6 +93,7 @@ +--- ssmtp-2.61.orig/ssmtp.c 2004-07-23 07:58:48.000000000 +0200 ++++ ssmtp-2.61/ssmtp.c 2011-01-17 14:46:46.000000000 +0100 +@@ -93,6 +93,7 @@ SSL *ssl; static char hextab[]="0123456789abcdef"; #endif @@ -19,7 +8,7 @@ /* log_event() -- Write event to syslog (or log file if defined) -@@ -129,7 +130,7 @@ +@@ -129,7 +130,7 @@ void log_event(int priority, char *forma #endif } @@ -28,7 +17,7 @@ int smtp_read(int fd, char *response); int smtp_read_all(int fd, char *response); int smtp_okay(int fd, char *response); -@@ -150,7 +151,7 @@ +@@ -150,7 +151,7 @@ void dead_letter(void) if(isatty(fileno(stdin))) { if(log_level > 0) { log_event(LOG_ERR, @@ -37,7 +26,7 @@ } return; } -@@ -964,6 +965,17 @@ +@@ -964,6 +965,17 @@ bool_t read_config() log_event(LOG_INFO, "Set AuthMethod=\"%s\"\n", auth_method); } } @@ -55,7 +44,7 @@ else { log_event(LOG_INFO, "Unable to set %s=\"%s\"\n", p, q); } -@@ -1232,10 +1244,11 @@ +@@ -1232,10 +1244,11 @@ ssize_t fd_puts(int fd, const void *buf, /* smtp_write() -- A printf to an fd and append <CR/LF> */ @@ -68,7 +57,7 @@ va_start(ap, format); if(vsnprintf(buf, (BUF_SZ - 2), format, ap) == -1) { -@@ -1252,7 +1265,9 @@ +@@ -1252,7 +1265,9 @@ void smtp_write(int fd, char *format, .. } (void)strcat(buf, "\r\n"); @@ -79,7 +68,7 @@ } /* -@@ -1282,6 +1297,8 @@ +@@ -1282,6 +1297,8 @@ int ssmtp(char *argv[]) int i, sock; uid_t uid; @@ -88,7 +77,7 @@ uid = getuid(); if((pw = getpwuid(uid)) == (struct passwd *)NULL) { die("Could not find password entry for UID %d", uid); -@@ -1335,10 +1352,10 @@ +@@ -1335,10 +1352,10 @@ int ssmtp(char *argv[]) /* If user supplied username and password, then try ELHO */ if(auth_user) { @@ -101,7 +90,7 @@ } (void)alarm((unsigned) MEDWAIT); -@@ -1354,7 +1371,7 @@ +@@ -1354,7 +1371,7 @@ int ssmtp(char *argv[]) } if(strcasecmp(auth_method, "cram-md5") == 0) { @@ -110,7 +99,7 @@ (void)alarm((unsigned) MEDWAIT); if(smtp_read(sock, buf) != 3) { -@@ -1369,7 +1386,7 @@ +@@ -1369,7 +1386,7 @@ int ssmtp(char *argv[]) #endif memset(buf, 0, sizeof(buf)); to64frombits(buf, auth_user, strlen(auth_user)); @@ -119,7 +108,7 @@ (void)alarm((unsigned) MEDWAIT); if(smtp_read(sock, buf) != 3) { -@@ -1381,7 +1398,7 @@ +@@ -1381,7 +1398,7 @@ int ssmtp(char *argv[]) #ifdef MD5AUTH } #endif @@ -128,7 +117,7 @@ (void)alarm((unsigned) MEDWAIT); if(smtp_okay(sock, buf) == False) { -@@ -1390,7 +1407,7 @@ +@@ -1390,7 +1407,7 @@ int ssmtp(char *argv[]) } /* Send "MAIL FROM:" line */ @@ -137,7 +126,7 @@ (void)alarm((unsigned) MEDWAIT); -@@ -1408,7 +1425,7 @@ +@@ -1408,7 +1425,7 @@ int ssmtp(char *argv[]) while(rt->next) { p = rcpt_remap(rt->string); @@ -146,7 +135,7 @@ (void)alarm((unsigned)MEDWAIT); -@@ -1425,7 +1442,7 @@ +@@ -1425,7 +1442,7 @@ int ssmtp(char *argv[]) while(p) { /* RFC822 Address -> "foo@bar" */ q = rcpt_remap(addr_parse(p)); @@ -155,7 +144,7 @@ (void)alarm((unsigned) MEDWAIT); -@@ -1439,7 +1456,7 @@ +@@ -1439,7 +1456,7 @@ int ssmtp(char *argv[]) } /* Send DATA */ @@ -164,7 +153,7 @@ (void)alarm((unsigned) MEDWAIT); if(smtp_read(sock, buf) != 3) { -@@ -1447,45 +1464,45 @@ +@@ -1447,45 +1464,45 @@ int ssmtp(char *argv[]) die("%s", buf); } @@ -218,7 +207,7 @@ (void)alarm((unsigned) MAXWAIT); if(smtp_okay(sock, buf) == 0) { -@@ -1495,11 +1512,12 @@ +@@ -1495,11 +1512,12 @@ int ssmtp(char *argv[]) /* Close conection */ (void)signal(SIGALRM, SIG_IGN); @@ -233,16 +222,3 @@ return(0); } ---- ssmtp-2.61.orig/configure.in -+++ ssmtp-2.61/configure.in -@@ -24,8 +24,8 @@ - AC_STRUCT_TM - - dnl Checks for libraries. --AC_CHECK_LIB(nsl, gethostname) --AC_CHECK_LIB(socket, socket) -+AC_SEARCH_LIBS(gethostname, nsl) -+AC_SEARCH_LIBS(socket, socket) - - dnl Checks for library functions. - AC_TYPE_SIGNAL diff --git a/package/ssmtp/patches/patch-ssmtp_conf b/package/ssmtp/patches/patch-ssmtp_conf new file mode 100644 index 000000000..fb8ffae95 --- /dev/null +++ b/package/ssmtp/patches/patch-ssmtp_conf @@ -0,0 +1,11 @@ +--- ssmtp-2.61.orig/ssmtp.conf 2004-07-23 07:58:48.000000000 +0200 ++++ ssmtp-2.61/ssmtp.conf 2011-01-17 14:46:46.000000000 +0100 +@@ -36,3 +36,8 @@ hostname=_HOSTNAME_ + + # Use this RSA certificate. + #TLSCert=/etc/ssl/certs/ssmtp.pem ++ ++# Get enhanced (*really* enhanced) debugging information in the logs ++# If you want to have debugging of the config file parsing, move this option ++# to the top of the config file and uncomment ++#Debug=YES diff --git a/package/strongswan/Makefile b/package/strongswan/Makefile index 6f7f117fe..19d552f85 100644 --- a/package/strongswan/Makefile +++ b/package/strongswan/Makefile @@ -18,7 +18,7 @@ PKG_DEPENDS+= kmod-crypto-hmac kmod-crypto-cbc kmod-crypto-authenc PKG_URL:= http://strongswan.org/index.htm PKG_SITES:= http://download.strongswan.org/ -PKG_CHOICES:= WITH_GMP WITH_OPENSSL WITH_GNUTLS +PKG_CHOICES_STRONGSWAN:=WITH_GMP WITH_OPENSSL WITH_GNUTLS PKGCD_WITH_GMP:= use GMP for crypto PKGCS_WITH_GMP:= libgmp PKGCB_WITH_GMP:= gmp diff --git a/package/strongswan/patches/patch-ltmain_sh b/package/strongswan/patches/patch-ltmain_sh new file mode 100644 index 000000000..826fc7cbc --- /dev/null +++ b/package/strongswan/patches/patch-ltmain_sh @@ -0,0 +1,11 @@ +--- strongswan-4.5.0.orig/ltmain.sh 2010-01-06 11:19:45.000000000 +0100 ++++ strongswan-4.5.0/ltmain.sh 2011-01-17 15:14:37.000000000 +0100 +@@ -4765,7 +4765,7 @@ func_mode_link () + # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC + # @file GCC response files + -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) + func_quote_for_eval "$arg" + arg="$func_quote_for_eval_result" + func_append compile_command " $arg" diff --git a/package/subversion/patches/patch-build_ltmain_sh b/package/subversion/patches/patch-build_ltmain_sh new file mode 100644 index 000000000..afcd82fd9 --- /dev/null +++ b/package/subversion/patches/patch-build_ltmain_sh @@ -0,0 +1,39 @@ +--- 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-17 15:25:25.000000000 +0100 +@@ -1676,7 +1676,7 @@ EOF + # -F/path gives path to uninstalled frameworks, gcc on darwin + # @file GCC response files + -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) + + # Unknown arguments in both finalize_command and compile_command need + # to be aesthetically quoted because they are evaled later. +@@ -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/sysfsutils/patches/patch-ltmain_sh b/package/sysfsutils/patches/patch-ltmain_sh new file mode 100644 index 000000000..b47531cfd --- /dev/null +++ b/package/sysfsutils/patches/patch-ltmain_sh @@ -0,0 +1,11 @@ +--- sysfsutils-2.1.0.orig/ltmain.sh 2006-05-26 09:57:20.000000000 +0200 ++++ sysfsutils-2.1.0/ltmain.sh 2011-01-16 15:35:26.000000000 +0100 +@@ -1623,7 +1623,7 @@ EOF + # -pg pass through profiling flag for GCC + # @file GCC response files + -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*|-pg| \ +- -t[45]*|-txscale*|@*) ++ -t[45]*|-txscale*|@*|-fstack-protector*|-flto) + + # Unknown arguments in both finalize_command and compile_command need + # to be aesthetically quoted because they are evaled later. diff --git a/package/syslinux/Makefile b/package/syslinux/Makefile index c5b8de89c..4a877426f 100644 --- a/package/syslinux/Makefile +++ b/package/syslinux/Makefile @@ -13,6 +13,8 @@ PKG_BUILDDEP:= nasm PKG_URL:= http://syslinux.zytor.com/wiki/index.php/The_Syslinux_Project PKG_SITES:= http://www.kernel.org/pub/linux/utils/boot/syslinux/ +PKG_HOST_DEPENDS:= !darwin !netbsd !openbsd !cygwin !freebsd + include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,SYSLINUX,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) diff --git a/package/tcl/Makefile b/package/tcl/Makefile index d6d257918..7b96c3b45 100644 --- a/package/tcl/Makefile +++ b/package/tcl/Makefile @@ -11,8 +11,6 @@ PKG_DESCR:= TCL scripting language PKG_SECTION:= lang PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=tcl/} -PKG_HOST_DEPENDS:= !darwin - DISTFILES:= tcl${PKG_VERSION}-src.tar.gz WRKDIST= ${WRKDIR}/tcl${PKG_VERSION} WRKSRC= ${WRKDIST}/unix @@ -25,8 +23,10 @@ TCFLAGS+= -ldl CONFIGURE_ENV+= tcl_cv_strstr_unbroken=ok \ tcl_cv_strtod_buggy=ok \ tcl_cv_strtod_unbroken=ok \ - tcl_cv_strtoul_unbroken=ok -CONFIGURE_ARGS+= --enable-man-symlinks + tcl_cv_strtoul_unbroken=ok \ + tcl_cv_sys_version="Linux-2.6" +CONFIGURE_ARGS+= --enable-man-symlinks \ + --disable-rpath INSTALL_TARGET= install-binaries install-libraries post-install: diff --git a/package/tcl/patches/patch-unix_configure b/package/tcl/patches/patch-unix_configure new file mode 100644 index 000000000..393c2b45e --- /dev/null +++ b/package/tcl/patches/patch-unix_configure @@ -0,0 +1,33 @@ +--- tcl8.5.8.orig/unix/configure 2009-11-13 19:38:45.000000000 +0100 ++++ tcl8.5.8/unix/configure 2011-01-13 16:22:59.000000000 +0100 +@@ -7968,9 +7968,6 @@ fi + LD_SEARCH_FLAGS="" + LD_LIBRARY_PATH_VAR="DYLD_LIBRARY_PATH" + +-cat >>confdefs.h <<\_ACEOF +-#define MAC_OSX_TCL 1 +-_ACEOF + + PLAT_OBJS='${MAC_OSX_OBJS}' + PLAT_SRCS='${MAC_OSX_SRCS}' +@@ -17646,11 +17643,6 @@ _ACEOF + + + cat >>confdefs.h <<\_ACEOF +-#define TCL_LOAD_FROM_MEMORY 1 +-_ACEOF +- +- +-cat >>confdefs.h <<\_ACEOF + #define TCL_WIDE_CLICKS 1 + _ACEOF + +@@ -18817,7 +18809,7 @@ HTML_DIR='$(DISTDIR)/html' + # AIX remembers this path and will attempt to use it at run-time to look + # up the Tcl library. + +-if test "`uname -s`" = "Darwin" ; then ++if test "Linux" = "Darwin" ; then + + if test "`uname -s`" = "Darwin" ; then + echo "$as_me:$LINENO: checking how to package libraries" >&5 diff --git a/package/tcl/patches/patch-unix_tclUnixTime_c b/package/tcl/patches/patch-unix_tclUnixTime_c new file mode 100644 index 000000000..e0334126f --- /dev/null +++ b/package/tcl/patches/patch-unix_tclUnixTime_c @@ -0,0 +1,39 @@ +--- tcl8.5.8.orig/unix/tclUnixTime.c 2008-04-14 19:49:59.000000000 +0200 ++++ tcl8.5.8/unix/tclUnixTime.c 2011-01-13 15:59:00.000000000 +0100 +@@ -164,12 +164,6 @@ TclpGetWideClicks(void) + + (*tclGetTimeProcPtr) (&time, tclTimeClientData); + now = (Tcl_WideInt) (time.sec*1000000 + time.usec); +- } else { +-#ifdef MAC_OSX_TCL +- now = (Tcl_WideInt) (mach_absolute_time() & INT64_MAX); +-#else +-#error Wide high-resolution clicks not implemented on this platform +-#endif + } + + return now; +@@ -200,23 +194,6 @@ TclpWideClicksToNanoseconds( + + if (tclGetTimeProcPtr != NativeGetTime) { + nsec = clicks * 1000; +- } else { +-#ifdef MAC_OSX_TCL +- static mach_timebase_info_data_t tb; +- static uint64_t maxClicksForUInt64; +- +- if (!tb.denom) { +- mach_timebase_info(&tb); +- maxClicksForUInt64 = UINT64_MAX / tb.numer; +- } +- if ((uint64_t) clicks < maxClicksForUInt64) { +- nsec = ((uint64_t) clicks) * tb.numer / tb.denom; +- } else { +- nsec = ((long double) (uint64_t) clicks) * tb.numer / tb.denom; +- } +-#else +-#error Wide high-resolution clicks not implemented on this platform +-#endif + } + + return nsec; diff --git a/package/tcp_wrappers/patches/patch-Makefile b/package/tcp_wrappers/patches/patch-Makefile index ef6edec07..dd737d4d5 100644 --- a/package/tcp_wrappers/patches/patch-Makefile +++ b/package/tcp_wrappers/patches/patch-Makefile @@ -1,5 +1,5 @@ --- tcp_wrappers_7.6.orig/Makefile 1997-03-21 19:27:21.000000000 +0100 -+++ tcp_wrappers_7.6/Makefile 2009-06-05 18:46:05.000000000 +0200 ++++ tcp_wrappers_7.6/Makefile 2011-01-17 15:40:16.000000000 +0100 @@ -1,5 +1,8 @@ # @(#) Makefile 1.23 97/03/21 19:27:20 @@ -195,41 +195,41 @@ - $(CC) $(CFLAGS) -o $@ tcpd.o $(LIB) $(LIBS) +$(SHLIB): $(SHLIB_OBJ) + rm -f $(SHLIB) -+ $(CC) -o $(SHLIB) $(SHLINKFLAGS) $(SHLIB_OBJ) ++ $(CC) $(LDFLAGS) -o $(SHLIB) $(SHLINKFLAGS) $(SHLIB_OBJ) + ln -s $(notdir $(SHLIB)) $(SHLIBSOMAJ) + ln -s $(notdir $(SHLIBSOMAJ)) $(SHLIBSO) -miscd: miscd.o $(LIB) - $(CC) $(CFLAGS) -o $@ miscd.o $(LIB) $(LIBS) +tcpd: tcpd.o $(SHLIB) -+ $(CC) $(CFLAGS) -o $@ tcpd.o $(SHLIBFLAGS) ++ $(CC) $(LDFLAGS) -o $@ tcpd.o $(SHLIBFLAGS) -safe_finger: safe_finger.o $(LIB) - $(CC) $(CFLAGS) -o $@ safe_finger.o $(LIB) $(LIBS) +miscd: miscd.o $(SHLIB) -+ $(CC) $(CFLAGS) -o $@ miscd.o $(SHLIBFLAGS) ++ $(CC) $(LDFLAGS) -o $@ miscd.o $(SHLIBFLAGS) + +safe_finger: safe_finger.o $(SHLIB) -+ $(CC) $(CFLAGS) -o $@ safe_finger.o $(SHLIBFLAGS) ++ $(CC) $(LDFLAGS) -o $@ safe_finger.o $(SHLIBFLAGS) TCPDMATCH_OBJ = tcpdmatch.o fakelog.o inetcf.o scaffold.o -tcpdmatch: $(TCPDMATCH_OBJ) $(LIB) - $(CC) $(CFLAGS) -o $@ $(TCPDMATCH_OBJ) $(LIB) $(LIBS) +tcpdmatch: $(TCPDMATCH_OBJ) $(SHLIB) -+ $(CC) $(CFLAGS) -o $@ $(TCPDMATCH_OBJ) $(SHLIBFLAGS) ++ $(CC) $(LDFLAGS) -o $@ $(TCPDMATCH_OBJ) $(SHLIBFLAGS) -try-from: try-from.o fakelog.o $(LIB) - $(CC) $(CFLAGS) -o $@ try-from.o fakelog.o $(LIB) $(LIBS) +try-from: try-from.o fakelog.o $(SHLIB) -+ $(CC) $(CFLAGS) -o $@ try-from.o fakelog.o $(SHLIBFLAGS) ++ $(CC) $(LDFLAGS) -o $@ try-from.o fakelog.o $(SHLIBFLAGS) TCPDCHK_OBJ = tcpdchk.o fakelog.o inetcf.o scaffold.o -tcpdchk: $(TCPDCHK_OBJ) $(LIB) - $(CC) $(CFLAGS) -o $@ $(TCPDCHK_OBJ) $(LIB) $(LIBS) +tcpdchk: $(TCPDCHK_OBJ) $(SHLIB) -+ $(CC) $(CFLAGS) -o $@ $(TCPDCHK_OBJ) $(SHLIBFLAGS) ++ $(CC) $(LDFLAGS) -o $@ $(TCPDCHK_OBJ) $(SHLIBFLAGS) + +install: install-lib install-bin install-dev + diff --git a/package/tcp_wrappers/patches/patch-cflags b/package/tcp_wrappers/patches/patch-cflags index 0581a2679..3ad8a423f 100644 --- a/package/tcp_wrappers/patches/patch-cflags +++ b/package/tcp_wrappers/patches/patch-cflags @@ -1,4 +1,4 @@ --- tcp_wrappers_7.6.orig/cflags 1970-01-01 00:00:00.000000000 +0100 -+++ tcp_wrappers_7.6/cflags 2010-11-11 20:03:51.771239624 +0100 ++++ tcp_wrappers_7.6/cflags 2011-01-17 15:32:42.000000000 +0100 @@ -0,0 +1 @@ -+-fno-ident -march=pentium-m -fomit-frame-pointer -O2 -pipe -fwrapv -DFACILITY=LOG_DAEMON -DHOSTS_ACCESS -DDAEMON_UMASK=022 -DREAL_DAEMON_DIR="/usr/sbin" -DPROCESS_OPTIONS -DKILL_IP_OPTIONS -DSEVERITY=LOG_INFO -DRFC931_TIMEOUT=10 -DHOSTS_DENY="/etc/hosts.deny" -DHOSTS_ALLOW="/etc/hosts.allow" -DSYS_ERRLIST_DEFINED -DHAVE_STRERROR -DHAVE_WEAKSYMS -D_REENTRANT -DINET6=1 -Dss_family=__ss_family -Dss_len=__ss_len ++-march=pentium-m -Os -pipe -fomit-frame-pointer -fwrapv -fstack-protector -fno-ident -fhonour-copts -DFACILITY=LOG_DAEMON -DHOSTS_ACCESS -DDAEMON_UMASK=022 -DREAL_DAEMON_DIR="/usr/sbin" -DPROCESS_OPTIONS -DKILL_IP_OPTIONS -DSEVERITY=LOG_INFO -DRFC931_TIMEOUT=10 -DHOSTS_DENY="/etc/hosts.deny" -DHOSTS_ALLOW="/etc/hosts.allow" -DSYS_ERRLIST_DEFINED -DHAVE_STRERROR -DHAVE_WEAKSYMS -D_REENTRANT -DINET6=1 -Dss_family=__ss_family -Dss_len=__ss_len diff --git a/package/tcpdump/Makefile b/package/tcpdump/Makefile index 5a25597b3..6eb5d62d3 100644 --- a/package/tcpdump/Makefile +++ b/package/tcpdump/Makefile @@ -14,8 +14,9 @@ PKG_BUILDDEP:= libpcap PKG_URL:= http://www.tcpdump.org/ PKG_SITES:= http://www.tcpdump.org/release/ -PKG_FLAVOURS:= WITH_IPV6 +PKG_FLAVOURS_TCPDUMP:= WITH_IPV6 WITH_CHROOT PKGFD_WITH_IPV6:= enable IPv6 support +PKGFD_WITH_CHROOT:= enable chrooting to /var/lib/tcpdump include ${TOPDIR}/mk/package.mk @@ -30,11 +31,17 @@ CONFIGURE_ARGS+= --enable-ipv6 else CONFIGURE_ARGS+= --disable-ipv6 endif +ifneq (${ADK_PACKAGE_TCPDUMP_WITH_CHROOT},) +CONFIGURE_ARGS+= --with-chroot="/var/lib/tcpdump" +endif XAKE_FLAGS+= CCOPT="${TARGET_CFLAGS}" \ INCLS="-I. -I${STAGING_TARGET_DIR}/usr/include" post-install: ${INSTALL_DIR} ${IDIR_TCPDUMP}/usr/sbin ${INSTALL_BIN} ${WRKINST}/usr/sbin/tcpdump ${IDIR_TCPDUMP}/usr/sbin/ +ifneq (${ADK_PACKAGE_TCPDUMP_WITH_CHROOT},) + ${INSTALL_DIR} ${IDIR_TCPDUMP}/var/lib/tcpdump +endif include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/traceroute/Makefile b/package/traceroute/Makefile index d8dd55fb0..65e5342c3 100644 --- a/package/traceroute/Makefile +++ b/package/traceroute/Makefile @@ -22,7 +22,7 @@ MAKE_FLAGS+= CC="${TARGET_CC}" \ AR="${TARGET_CROSS}ar" \ RANLIB="${TARGET_CROSS}ranlib" \ CFLAGS="${TCFLAGS}" \ - LDFLAGS="-L${WRKSRC}/libsupp" + LDFLAGS="${TARGET_LDFLAGS} -L${WRKSRC}/libsupp" post-install: $(INSTALL_DIR) $(IDIR_TRACEROUTE)/usr/bin diff --git a/package/traceroute/patches/patch-default_rules b/package/traceroute/patches/patch-default_rules new file mode 100644 index 000000000..1351f747f --- /dev/null +++ b/package/traceroute/patches/patch-default_rules @@ -0,0 +1,11 @@ +--- traceroute-2.0.16.orig/default.rules 2010-09-09 16:20:06.000000000 +0200 ++++ traceroute-2.0.16/default.rules 2011-01-17 15:53:37.000000000 +0100 +@@ -44,7 +44,7 @@ ifeq ($(shared),yes) + all: $(TARGET).so + + $(TARGET).so: $(OBJS) +- $(CC) -shared -o $@ -Wl,-soname -Wl,$@ $(OBJS) ++ $(CC) $(LDFLAGS) -shared -o $@ -Wl,-soname -Wl,$@ $(OBJS) + + else + diff --git a/package/tslib/Makefile b/package/tslib/Makefile index ff0afe6c9..17301acf5 100644 --- a/package/tslib/Makefile +++ b/package/tslib/Makefile @@ -11,6 +11,7 @@ PKG_DESCR:= touchscreen library PKG_SECTION:= libs PKG_URL:= http://tslib.berlios.de/ PKG_SITES:= http://download.berlios.de/tslib/ +PKG_NEED_CXX:= 1 DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 diff --git a/package/tslib/patches/patch-ltmain_sh b/package/tslib/patches/patch-ltmain_sh new file mode 100644 index 000000000..8abaeff72 --- /dev/null +++ b/package/tslib/patches/patch-ltmain_sh @@ -0,0 +1,8416 @@ +--- tslib-1.0.orig/ltmain.sh 1970-01-01 00:00:00.000000000 +0100 ++++ tslib-1.0/ltmain.sh 2011-01-14 23:22:44.000000000 +0100 +@@ -0,0 +1,8413 @@ ++# Generated from ltmain.m4sh. ++ ++# ltmain.sh (GNU libtool) 2.2.6b ++# Written by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996 ++ ++# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, 2007 2008 Free Software Foundation, Inc. ++# This is free software; see the source for copying conditions. There is NO ++# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. ++ ++# GNU Libtool is free software; you can redistribute it and/or modify ++# it under the terms of the GNU General Public License as published by ++# the Free Software Foundation; either version 2 of the License, or ++# (at your option) any later version. ++# ++# As a special exception to the GNU General Public License, ++# if you distribute this file as part of a program or library that ++# is built using GNU Libtool, you may include this file under the ++# same distribution terms that you use for the rest of that program. ++# ++# GNU Libtool is distributed in the hope that it will be useful, but ++# WITHOUT ANY WARRANTY; without even the implied warranty of ++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++# General Public License for more details. ++# ++# You should have received a copy of the GNU General Public License ++# along with GNU Libtool; see the file COPYING. If not, a copy ++# can be downloaded from http://www.gnu.org/licenses/gpl.html, ++# or obtained by writing to the Free Software Foundation, Inc., ++# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ++ ++# Usage: $progname [OPTION]... [MODE-ARG]... ++# ++# Provide generalized library-building support services. ++# ++# --config show all configuration variables ++# --debug enable verbose shell tracing ++# -n, --dry-run display commands without modifying any files ++# --features display basic configuration information and exit ++# --mode=MODE use operation mode MODE ++# --preserve-dup-deps don't remove duplicate dependency libraries ++# --quiet, --silent don't print informational messages ++# --tag=TAG use configuration variables from tag TAG ++# -v, --verbose print informational messages (default) ++# --version print version information ++# -h, --help print short or long help message ++# ++# MODE must be one of the following: ++# ++# clean remove files from the build directory ++# compile compile a source file into a libtool object ++# execute automatically set library path, then run a program ++# finish complete the installation of libtool libraries ++# install install libraries or executables ++# link create a library or an executable ++# uninstall remove libraries from an installed directory ++# ++# MODE-ARGS vary depending on the MODE. ++# Try `$progname --help --mode=MODE' for a more detailed description of MODE. ++# ++# When reporting a bug, please describe a test case to reproduce it and ++# include the following information: ++# ++# host-triplet: $host ++# shell: $SHELL ++# compiler: $LTCC ++# compiler flags: $LTCFLAGS ++# linker: $LD (gnu? $with_gnu_ld) ++# $progname: (GNU libtool) 2.2.6b Debian-2.2.6b-2ubuntu1 ++# automake: $automake_version ++# autoconf: $autoconf_version ++# ++# Report bugs to <bug-libtool@gnu.org>. ++ ++PROGRAM=ltmain.sh ++PACKAGE=libtool ++VERSION="2.2.6b Debian-2.2.6b-2ubuntu1" ++TIMESTAMP="" ++package_revision=1.3017 ++ ++# Be Bourne compatible ++if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then ++ emulate sh ++ NULLCMD=: ++ # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which ++ # is contrary to our usage. Disable this feature. ++ alias -g '${1+"$@"}'='"$@"' ++ setopt NO_GLOB_SUBST ++else ++ case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac ++fi ++BIN_SH=xpg4; export BIN_SH # for Tru64 ++DUALCASE=1; export DUALCASE # for MKS sh ++ ++# NLS nuisances: We save the old values to restore during execute mode. ++# Only set LANG and LC_ALL to C if already set. ++# These must not be set unconditionally because not all systems understand ++# e.g. LANG=C (notably SCO). ++lt_user_locale= ++lt_safe_locale= ++for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES ++do ++ eval "if test \"\${$lt_var+set}\" = set; then ++ save_$lt_var=\$$lt_var ++ $lt_var=C ++ export $lt_var ++ lt_user_locale=\"$lt_var=\\\$save_\$lt_var; \$lt_user_locale\" ++ lt_safe_locale=\"$lt_var=C; \$lt_safe_locale\" ++ fi" ++done ++ ++$lt_unset CDPATH ++ ++ ++ ++ ++ ++: ${CP="cp -f"} ++: ${ECHO="echo"} ++: ${EGREP="/bin/grep -E"} ++: ${FGREP="/bin/grep -F"} ++: ${GREP="/bin/grep"} ++: ${LN_S="ln -s"} ++: ${MAKE="make"} ++: ${MKDIR="mkdir"} ++: ${MV="mv -f"} ++: ${RM="rm -f"} ++: ${SED="/bin/sed"} ++: ${SHELL="${CONFIG_SHELL-/bin/sh}"} ++: ${Xsed="$SED -e 1s/^X//"} ++ ++# Global variables: ++EXIT_SUCCESS=0 ++EXIT_FAILURE=1 ++EXIT_MISMATCH=63 # $? = 63 is used to indicate version mismatch to missing. ++EXIT_SKIP=77 # $? = 77 is used to indicate a skipped test to automake. ++ ++exit_status=$EXIT_SUCCESS ++ ++# Make sure IFS has a sensible default ++lt_nl=' ++' ++IFS=" $lt_nl" ++ ++dirname="s,/[^/]*$,," ++basename="s,^.*/,," ++ ++# func_dirname_and_basename file append nondir_replacement ++# perform func_basename and func_dirname in a single function ++# call: ++# dirname: Compute the dirname of FILE. If nonempty, ++# add APPEND to the result, otherwise set result ++# to NONDIR_REPLACEMENT. ++# value returned in "$func_dirname_result" ++# basename: Compute filename of FILE. ++# value retuned in "$func_basename_result" ++# Implementation must be kept synchronized with func_dirname ++# and func_basename. For efficiency, we do not delegate to ++# those functions but instead duplicate the functionality here. ++func_dirname_and_basename () ++{ ++ # Extract subdirectory from the argument. ++ func_dirname_result=`$ECHO "X${1}" | $Xsed -e "$dirname"` ++ if test "X$func_dirname_result" = "X${1}"; then ++ func_dirname_result="${3}" ++ else ++ func_dirname_result="$func_dirname_result${2}" ++ fi ++ func_basename_result=`$ECHO "X${1}" | $Xsed -e "$basename"` ++} ++ ++# Generated shell functions inserted here. ++ ++# Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh ++# is ksh but when the shell is invoked as "sh" and the current value of ++# the _XPG environment variable is not equal to 1 (one), the special ++# positional parameter $0, within a function call, is the name of the ++# function. ++progpath="$0" ++ ++# The name of this program: ++# In the unlikely event $progname began with a '-', it would play havoc with ++# func_echo (imagine progname=-n), so we prepend ./ in that case: ++func_dirname_and_basename "$progpath" ++progname=$func_basename_result ++case $progname in ++ -*) progname=./$progname ;; ++esac ++ ++# Make sure we have an absolute path for reexecution: ++case $progpath in ++ [\\/]*|[A-Za-z]:\\*) ;; ++ *[\\/]*) ++ progdir=$func_dirname_result ++ progdir=`cd "$progdir" && pwd` ++ progpath="$progdir/$progname" ++ ;; ++ *) ++ save_IFS="$IFS" ++ IFS=: ++ for progdir in $PATH; do ++ IFS="$save_IFS" ++ test -x "$progdir/$progname" && break ++ done ++ IFS="$save_IFS" ++ test -n "$progdir" || progdir=`pwd` ++ progpath="$progdir/$progname" ++ ;; ++esac ++ ++# Sed substitution that helps us do robust quoting. It backslashifies ++# metacharacters that are still active within double-quoted strings. ++Xsed="${SED}"' -e 1s/^X//' ++sed_quote_subst='s/\([`"$\\]\)/\\\1/g' ++ ++# Same as above, but do not quote variable references. ++double_quote_subst='s/\(["`\\]\)/\\\1/g' ++ ++# Re-`\' parameter expansions in output of double_quote_subst that were ++# `\'-ed in input to the same. If an odd number of `\' preceded a '$' ++# in input to double_quote_subst, that '$' was protected from expansion. ++# Since each input `\' is now two `\'s, look for any number of runs of ++# four `\'s followed by two `\'s and then a '$'. `\' that '$'. ++bs='\\' ++bs2='\\\\' ++bs4='\\\\\\\\' ++dollar='\$' ++sed_double_backslash="\ ++ s/$bs4/&\\ ++/g ++ s/^$bs2$dollar/$bs&/ ++ s/\\([^$bs]\\)$bs2$dollar/\\1$bs2$bs$dollar/g ++ s/\n//g" ++ ++# Standard options: ++opt_dry_run=false ++opt_help=false ++opt_quiet=false ++opt_verbose=false ++opt_warning=: ++ ++# func_echo arg... ++# Echo program name prefixed message, along with the current mode ++# name if it has been set yet. ++func_echo () ++{ ++ $ECHO "$progname${mode+: }$mode: $*" ++} ++ ++# func_verbose arg... ++# Echo program name prefixed message in verbose mode only. ++func_verbose () ++{ ++ $opt_verbose && func_echo ${1+"$@"} ++ ++ # A bug in bash halts the script if the last line of a function ++ # fails when set -e is in force, so we need another command to ++ # work around that: ++ : ++} ++ ++# func_error arg... ++# Echo program name prefixed message to standard error. ++func_error () ++{ ++ $ECHO "$progname${mode+: }$mode: "${1+"$@"} 1>&2 ++} ++ ++# func_warning arg... ++# Echo program name prefixed warning message to standard error. ++func_warning () ++{ ++ $opt_warning && $ECHO "$progname${mode+: }$mode: warning: "${1+"$@"} 1>&2 ++ ++ # bash bug again: ++ : ++} ++ ++# func_fatal_error arg... ++# Echo program name prefixed message to standard error, and exit. ++func_fatal_error () ++{ ++ func_error ${1+"$@"} ++ exit $EXIT_FAILURE ++} ++ ++# func_fatal_help arg... ++# Echo program name prefixed message to standard error, followed by ++# a help hint, and exit. ++func_fatal_help () ++{ ++ func_error ${1+"$@"} ++ func_fatal_error "$help" ++} ++help="Try \`$progname --help' for more information." ## default ++ ++ ++# func_grep expression filename ++# Check whether EXPRESSION matches any line of FILENAME, without output. ++func_grep () ++{ ++ $GREP "$1" "$2" >/dev/null 2>&1 ++} ++ ++ ++# func_mkdir_p directory-path ++# Make sure the entire path to DIRECTORY-PATH is available. ++func_mkdir_p () ++{ ++ my_directory_path="$1" ++ my_dir_list= ++ ++ if test -n "$my_directory_path" && test "$opt_dry_run" != ":"; then ++ ++ # Protect directory names starting with `-' ++ case $my_directory_path in ++ -*) my_directory_path="./$my_directory_path" ;; ++ esac ++ ++ # While some portion of DIR does not yet exist... ++ while test ! -d "$my_directory_path"; do ++ # ...make a list in topmost first order. Use a colon delimited ++ # list incase some portion of path contains whitespace. ++ my_dir_list="$my_directory_path:$my_dir_list" ++ ++ # If the last portion added has no slash in it, the list is done ++ case $my_directory_path in */*) ;; *) break ;; esac ++ ++ # ...otherwise throw away the child directory and loop ++ my_directory_path=`$ECHO "X$my_directory_path" | $Xsed -e "$dirname"` ++ done ++ my_dir_list=`$ECHO "X$my_dir_list" | $Xsed -e 's,:*$,,'` ++ ++ save_mkdir_p_IFS="$IFS"; IFS=':' ++ for my_dir in $my_dir_list; do ++ IFS="$save_mkdir_p_IFS" ++ # mkdir can fail with a `File exist' error if two processes ++ # try to create one of the directories concurrently. Don't ++ # stop in that case! ++ $MKDIR "$my_dir" 2>/dev/null || : ++ done ++ IFS="$save_mkdir_p_IFS" ++ ++ # Bail out if we (or some other process) failed to create a directory. ++ test -d "$my_directory_path" || \ ++ func_fatal_error "Failed to create \`$1'" ++ fi ++} ++ ++ ++# func_mktempdir [string] ++# Make a temporary directory that won't clash with other running ++# libtool processes, and avoids race conditions if possible. If ++# given, STRING is the basename for that directory. ++func_mktempdir () ++{ ++ my_template="${TMPDIR-/tmp}/${1-$progname}" ++ ++ if test "$opt_dry_run" = ":"; then ++ # Return a directory name, but don't create it in dry-run mode ++ my_tmpdir="${my_template}-$$" ++ else ++ ++ # If mktemp works, use that first and foremost ++ my_tmpdir=`mktemp -d "${my_template}-XXXXXXXX" 2>/dev/null` ++ ++ if test ! -d "$my_tmpdir"; then ++ # Failing that, at least try and use $RANDOM to avoid a race ++ my_tmpdir="${my_template}-${RANDOM-0}$$" ++ ++ save_mktempdir_umask=`umask` ++ umask 0077 ++ $MKDIR "$my_tmpdir" ++ umask $save_mktempdir_umask ++ fi ++ ++ # If we're not in dry-run mode, bomb out on failure ++ test -d "$my_tmpdir" || \ ++ func_fatal_error "cannot create temporary directory \`$my_tmpdir'" ++ fi ++ ++ $ECHO "X$my_tmpdir" | $Xsed ++} ++ ++ ++# func_quote_for_eval arg ++# Aesthetically quote ARG to be evaled later. ++# This function returns two values: FUNC_QUOTE_FOR_EVAL_RESULT ++# is double-quoted, suitable for a subsequent eval, whereas ++# FUNC_QUOTE_FOR_EVAL_UNQUOTED_RESULT has merely all characters ++# which are still active within double quotes backslashified. ++func_quote_for_eval () ++{ ++ case $1 in ++ *[\\\`\"\$]*) ++ func_quote_for_eval_unquoted_result=`$ECHO "X$1" | $Xsed -e "$sed_quote_subst"` ;; ++ *) ++ func_quote_for_eval_unquoted_result="$1" ;; ++ esac ++ ++ case $func_quote_for_eval_unquoted_result in ++ # Double-quote args containing shell metacharacters to delay ++ # word splitting, command substitution and and variable ++ # expansion for a subsequent eval. ++ # Many Bourne shells cannot handle close brackets correctly ++ # in scan sets, so we specify it separately. ++ *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") ++ func_quote_for_eval_result="\"$func_quote_for_eval_unquoted_result\"" ++ ;; ++ *) ++ func_quote_for_eval_result="$func_quote_for_eval_unquoted_result" ++ esac ++} ++ ++ ++# func_quote_for_expand arg ++# Aesthetically quote ARG to be evaled later; same as above, ++# but do not quote variable references. ++func_quote_for_expand () ++{ ++ case $1 in ++ *[\\\`\"]*) ++ my_arg=`$ECHO "X$1" | $Xsed \ ++ -e "$double_quote_subst" -e "$sed_double_backslash"` ;; ++ *) ++ my_arg="$1" ;; ++ esac ++ ++ case $my_arg in ++ # Double-quote args containing shell metacharacters to delay ++ # word splitting and command substitution for a subsequent eval. ++ # Many Bourne shells cannot handle close brackets correctly ++ # in scan sets, so we specify it separately. ++ *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") ++ my_arg="\"$my_arg\"" ++ ;; ++ esac ++ ++ func_quote_for_expand_result="$my_arg" ++} ++ ++ ++# func_show_eval cmd [fail_exp] ++# Unless opt_silent is true, then output CMD. Then, if opt_dryrun is ++# not true, evaluate CMD. If the evaluation of CMD fails, and FAIL_EXP ++# is given, then evaluate it. ++func_show_eval () ++{ ++ my_cmd="$1" ++ my_fail_exp="${2-:}" ++ ++ ${opt_silent-false} || { ++ func_quote_for_expand "$my_cmd" ++ eval "func_echo $func_quote_for_expand_result" ++ } ++ ++ if ${opt_dry_run-false}; then :; else ++ eval "$my_cmd" ++ my_status=$? ++ if test "$my_status" -eq 0; then :; else ++ eval "(exit $my_status); $my_fail_exp" ++ fi ++ fi ++} ++ ++ ++# func_show_eval_locale cmd [fail_exp] ++# Unless opt_silent is true, then output CMD. Then, if opt_dryrun is ++# not true, evaluate CMD. If the evaluation of CMD fails, and FAIL_EXP ++# is given, then evaluate it. Use the saved locale for evaluation. ++func_show_eval_locale () ++{ ++ my_cmd="$1" ++ my_fail_exp="${2-:}" ++ ++ ${opt_silent-false} || { ++ func_quote_for_expand "$my_cmd" ++ eval "func_echo $func_quote_for_expand_result" ++ } ++ ++ if ${opt_dry_run-false}; then :; else ++ eval "$lt_user_locale ++ $my_cmd" ++ my_status=$? ++ eval "$lt_safe_locale" ++ if test "$my_status" -eq 0; then :; else ++ eval "(exit $my_status); $my_fail_exp" ++ fi ++ fi ++} ++ ++ ++ ++ ++ ++# func_version ++# Echo version message to standard output and exit. ++func_version () ++{ ++ $SED -n '/^# '$PROGRAM' (GNU /,/# warranty; / { ++ s/^# // ++ s/^# *$// ++ s/\((C)\)[ 0-9,-]*\( [1-9][0-9]*\)/\1\2/ ++ p ++ }' < "$progpath" ++ exit $? ++} ++ ++# func_usage ++# Echo short help message to standard output and exit. ++func_usage () ++{ ++ $SED -n '/^# Usage:/,/# -h/ { ++ s/^# // ++ s/^# *$// ++ s/\$progname/'$progname'/ ++ p ++ }' < "$progpath" ++ $ECHO ++ $ECHO "run \`$progname --help | more' for full usage" ++ exit $? ++} ++ ++# func_help ++# Echo long help message to standard output and exit. ++func_help () ++{ ++ $SED -n '/^# Usage:/,/# Report bugs to/ { ++ s/^# // ++ s/^# *$// ++ s*\$progname*'$progname'* ++ s*\$host*'"$host"'* ++ s*\$SHELL*'"$SHELL"'* ++ s*\$LTCC*'"$LTCC"'* ++ s*\$LTCFLAGS*'"$LTCFLAGS"'* ++ s*\$LD*'"$LD"'* ++ s/\$with_gnu_ld/'"$with_gnu_ld"'/ ++ s/\$automake_version/'"`(automake --version) 2>/dev/null |$SED 1q`"'/ ++ s/\$autoconf_version/'"`(autoconf --version) 2>/dev/null |$SED 1q`"'/ ++ p ++ }' < "$progpath" ++ exit $? ++} ++ ++# func_missing_arg argname ++# Echo program name prefixed message to standard error and set global ++# exit_cmd. ++func_missing_arg () ++{ ++ func_error "missing argument for $1" ++ exit_cmd=exit ++} ++ ++exit_cmd=: ++ ++ ++ ++ ++ ++# Check that we have a working $ECHO. ++if test "X$1" = X--no-reexec; then ++ # Discard the --no-reexec flag, and continue. ++ shift ++elif test "X$1" = X--fallback-echo; then ++ # Avoid inline document here, it may be left over ++ : ++elif test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t'; then ++ # Yippee, $ECHO works! ++ : ++else ++ # Restart under the correct shell, and then maybe $ECHO will work. ++ exec $SHELL "$progpath" --no-reexec ${1+"$@"} ++fi ++ ++if test "X$1" = X--fallback-echo; then ++ # used as fallback echo ++ shift ++ cat <<EOF ++$* ++EOF ++ exit $EXIT_SUCCESS ++fi ++ ++magic="%%%MAGIC variable%%%" ++magic_exe="%%%MAGIC EXE variable%%%" ++ ++# Global variables. ++# $mode is unset ++nonopt= ++execute_dlfiles= ++preserve_args= ++lo2o="s/\\.lo\$/.${objext}/" ++o2lo="s/\\.${objext}\$/.lo/" ++extracted_archives= ++extracted_serial=0 ++ ++opt_dry_run=false ++opt_duplicate_deps=false ++opt_silent=false ++opt_debug=: ++ ++# If this variable is set in any of the actions, the command in it ++# will be execed at the end. This prevents here-documents from being ++# left over by shells. ++exec_cmd= ++ ++# func_fatal_configuration arg... ++# Echo program name prefixed message to standard error, followed by ++# a configuration failure hint, and exit. ++func_fatal_configuration () ++{ ++ func_error ${1+"$@"} ++ func_error "See the $PACKAGE documentation for more information." ++ func_fatal_error "Fatal configuration error." ++} ++ ++ ++# func_config ++# Display the configuration for all the tags in this script. ++func_config () ++{ ++ re_begincf='^# ### BEGIN LIBTOOL' ++ re_endcf='^# ### END LIBTOOL' ++ ++ # Default configuration. ++ $SED "1,/$re_begincf CONFIG/d;/$re_endcf CONFIG/,\$d" < "$progpath" ++ ++ # Now print the configurations for the tags. ++ for tagname in $taglist; do ++ $SED -n "/$re_begincf TAG CONFIG: $tagname\$/,/$re_endcf TAG CONFIG: $tagname\$/p" < "$progpath" ++ done ++ ++ exit $? ++} ++ ++# func_features ++# Display the features supported by this script. ++func_features () ++{ ++ $ECHO "host: $host" ++ if test "$build_libtool_libs" = yes; then ++ $ECHO "enable shared libraries" ++ else ++ $ECHO "disable shared libraries" ++ fi ++ if test "$build_old_libs" = yes; then ++ $ECHO "enable static libraries" ++ else ++ $ECHO "disable static libraries" ++ fi ++ ++ exit $? ++} ++ ++# func_enable_tag tagname ++# Verify that TAGNAME is valid, and either flag an error and exit, or ++# enable the TAGNAME tag. We also add TAGNAME to the global $taglist ++# variable here. ++func_enable_tag () ++{ ++ # Global variable: ++ tagname="$1" ++ ++ re_begincf="^# ### BEGIN LIBTOOL TAG CONFIG: $tagname\$" ++ re_endcf="^# ### END LIBTOOL TAG CONFIG: $tagname\$" ++ sed_extractcf="/$re_begincf/,/$re_endcf/p" ++ ++ # Validate tagname. ++ case $tagname in ++ *[!-_A-Za-z0-9,/]*) ++ func_fatal_error "invalid tag name: $tagname" ++ ;; ++ esac ++ ++ # Don't test for the "default" C tag, as we know it's ++ # there but not specially marked. ++ case $tagname in ++ CC) ;; ++ *) ++ if $GREP "$re_begincf" "$progpath" >/dev/null 2>&1; then ++ taglist="$taglist $tagname" ++ ++ # Evaluate the configuration. Be careful to quote the path ++ # and the sed script, to avoid splitting on whitespace, but ++ # also don't use non-portable quotes within backquotes within ++ # quotes we have to do it in 2 steps: ++ extractedcf=`$SED -n -e "$sed_extractcf" < "$progpath"` ++ eval "$extractedcf" ++ else ++ func_error "ignoring unknown tag $tagname" ++ fi ++ ;; ++ esac ++} ++ ++# Parse options once, thoroughly. This comes as soon as possible in ++# the script to make things like `libtool --version' happen quickly. ++{ ++ ++ # Shorthand for --mode=foo, only valid as the first argument ++ case $1 in ++ clean|clea|cle|cl) ++ shift; set dummy --mode clean ${1+"$@"}; shift ++ ;; ++ compile|compil|compi|comp|com|co|c) ++ shift; set dummy --mode compile ${1+"$@"}; shift ++ ;; ++ execute|execut|execu|exec|exe|ex|e) ++ shift; set dummy --mode execute ${1+"$@"}; shift ++ ;; ++ finish|finis|fini|fin|fi|f) ++ shift; set dummy --mode finish ${1+"$@"}; shift ++ ;; ++ install|instal|insta|inst|ins|in|i) ++ shift; set dummy --mode install ${1+"$@"}; shift ++ ;; ++ link|lin|li|l) ++ shift; set dummy --mode link ${1+"$@"}; shift ++ ;; ++ uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u) ++ shift; set dummy --mode uninstall ${1+"$@"}; shift ++ ;; ++ esac ++ ++ # Parse non-mode specific arguments: ++ while test "$#" -gt 0; do ++ opt="$1" ++ shift ++ ++ case $opt in ++ --config) func_config ;; ++ ++ --debug) preserve_args="$preserve_args $opt" ++ func_echo "enabling shell trace mode" ++ opt_debug='set -x' ++ $opt_debug ++ ;; ++ ++ -dlopen) test "$#" -eq 0 && func_missing_arg "$opt" && break ++ execute_dlfiles="$execute_dlfiles $1" ++ shift ++ ;; ++ ++ --dry-run | -n) opt_dry_run=: ;; ++ --features) func_features ;; ++ --finish) mode="finish" ;; ++ ++ --mode) test "$#" -eq 0 && func_missing_arg "$opt" && break ++ case $1 in ++ # Valid mode arguments: ++ clean) ;; ++ compile) ;; ++ execute) ;; ++ finish) ;; ++ install) ;; ++ link) ;; ++ relink) ;; ++ uninstall) ;; ++ ++ # Catch anything else as an error ++ *) func_error "invalid argument for $opt" ++ exit_cmd=exit ++ break ++ ;; ++ esac ++ ++ mode="$1" ++ shift ++ ;; ++ ++ --preserve-dup-deps) ++ opt_duplicate_deps=: ;; ++ ++ --quiet|--silent) preserve_args="$preserve_args $opt" ++ opt_silent=: ++ ;; ++ ++ --verbose| -v) preserve_args="$preserve_args $opt" ++ opt_silent=false ++ ;; ++ ++ --tag) test "$#" -eq 0 && func_missing_arg "$opt" && break ++ preserve_args="$preserve_args $opt $1" ++ func_enable_tag "$1" # tagname is set here ++ shift ++ ;; ++ ++ # Separate optargs to long options: ++ -dlopen=*|--mode=*|--tag=*) ++ func_opt_split "$opt" ++ set dummy "$func_opt_split_opt" "$func_opt_split_arg" ${1+"$@"} ++ shift ++ ;; ++ ++ -\?|-h) func_usage ;; ++ --help) opt_help=: ;; ++ --version) func_version ;; ++ ++ -*) func_fatal_help "unrecognized option \`$opt'" ;; ++ ++ *) nonopt="$opt" ++ break ++ ;; ++ esac ++ done ++ ++ ++ case $host in ++ *cygwin* | *mingw* | *pw32* | *cegcc*) ++ # don't eliminate duplications in $postdeps and $predeps ++ opt_duplicate_compiler_generated_deps=: ++ ;; ++ *) ++ opt_duplicate_compiler_generated_deps=$opt_duplicate_deps ++ ;; ++ esac ++ ++ # Having warned about all mis-specified options, bail out if ++ # anything was wrong. ++ $exit_cmd $EXIT_FAILURE ++} ++ ++# func_check_version_match ++# Ensure that we are using m4 macros, and libtool script from the same ++# release of libtool. ++func_check_version_match () ++{ ++ if test "$package_revision" != "$macro_revision"; then ++ if test "$VERSION" != "$macro_version"; then ++ if test -z "$macro_version"; then ++ cat >&2 <<_LT_EOF ++$progname: Version mismatch error. This is $PACKAGE $VERSION, but the ++$progname: definition of this LT_INIT comes from an older release. ++$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION ++$progname: and run autoconf again. ++_LT_EOF ++ else ++ cat >&2 <<_LT_EOF ++$progname: Version mismatch error. This is $PACKAGE $VERSION, but the ++$progname: definition of this LT_INIT comes from $PACKAGE $macro_version. ++$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION ++$progname: and run autoconf again. ++_LT_EOF ++ fi ++ else ++ cat >&2 <<_LT_EOF ++$progname: Version mismatch error. This is $PACKAGE $VERSION, revision $package_revision, ++$progname: but the definition of this LT_INIT comes from revision $macro_revision. ++$progname: You should recreate aclocal.m4 with macros from revision $package_revision ++$progname: of $PACKAGE $VERSION and run autoconf again. ++_LT_EOF ++ fi ++ ++ exit $EXIT_MISMATCH ++ fi ++} ++ ++ ++## ----------- ## ++## Main. ## ++## ----------- ## ++ ++$opt_help || { ++ # Sanity checks first: ++ func_check_version_match ++ ++ if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then ++ func_fatal_configuration "not configured to build any kind of library" ++ fi ++ ++ test -z "$mode" && func_fatal_error "error: you must specify a MODE." ++ ++ ++ # Darwin sucks ++ eval std_shrext=\"$shrext_cmds\" ++ ++ ++ # Only execute mode is allowed to have -dlopen flags. ++ if test -n "$execute_dlfiles" && test "$mode" != execute; then ++ func_error "unrecognized option \`-dlopen'" ++ $ECHO "$help" 1>&2 ++ exit $EXIT_FAILURE ++ fi ++ ++ # Change the help message to a mode-specific one. ++ generic_help="$help" ++ help="Try \`$progname --help --mode=$mode' for more information." ++} ++ ++ ++# func_lalib_p file ++# True iff FILE is a libtool `.la' library or `.lo' object file. ++# This function is only a basic sanity check; it will hardly flush out ++# determined imposters. ++func_lalib_p () ++{ ++ test -f "$1" && ++ $SED -e 4q "$1" 2>/dev/null \ ++ | $GREP "^# Generated by .*$PACKAGE" > /dev/null 2>&1 ++} ++ ++# func_lalib_unsafe_p file ++# True iff FILE is a libtool `.la' library or `.lo' object file. ++# This function implements the same check as func_lalib_p without ++# resorting to external programs. To this end, it redirects stdin and ++# closes it afterwards, without saving the original file descriptor. ++# As a safety measure, use it only where a negative result would be ++# fatal anyway. Works if `file' does not exist. ++func_lalib_unsafe_p () ++{ ++ lalib_p=no ++ if test -f "$1" && test -r "$1" && exec 5<&0 <"$1"; then ++ for lalib_p_l in 1 2 3 4 ++ do ++ read lalib_p_line ++ case "$lalib_p_line" in ++ \#\ Generated\ by\ *$PACKAGE* ) lalib_p=yes; break;; ++ esac ++ done ++ exec 0<&5 5<&- ++ fi ++ test "$lalib_p" = yes ++} ++ ++# func_ltwrapper_script_p file ++# True iff FILE is a libtool wrapper script ++# This function is only a basic sanity check; it will hardly flush out ++# determined imposters. ++func_ltwrapper_script_p () ++{ ++ func_lalib_p "$1" ++} ++ ++# func_ltwrapper_executable_p file ++# True iff FILE is a libtool wrapper executable ++# This function is only a basic sanity check; it will hardly flush out ++# determined imposters. ++func_ltwrapper_executable_p () ++{ ++ func_ltwrapper_exec_suffix= ++ case $1 in ++ *.exe) ;; ++ *) func_ltwrapper_exec_suffix=.exe ;; ++ esac ++ $GREP "$magic_exe" "$1$func_ltwrapper_exec_suffix" >/dev/null 2>&1 ++} ++ ++# func_ltwrapper_scriptname file ++# Assumes file is an ltwrapper_executable ++# uses $file to determine the appropriate filename for a ++# temporary ltwrapper_script. ++func_ltwrapper_scriptname () ++{ ++ func_ltwrapper_scriptname_result="" ++ if func_ltwrapper_executable_p "$1"; then ++ func_dirname_and_basename "$1" "" "." ++ func_stripname '' '.exe' "$func_basename_result" ++ func_ltwrapper_scriptname_result="$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper" ++ fi ++} ++ ++# func_ltwrapper_p file ++# True iff FILE is a libtool wrapper script or wrapper executable ++# This function is only a basic sanity check; it will hardly flush out ++# determined imposters. ++func_ltwrapper_p () ++{ ++ func_ltwrapper_script_p "$1" || func_ltwrapper_executable_p "$1" ++} ++ ++ ++# func_execute_cmds commands fail_cmd ++# Execute tilde-delimited COMMANDS. ++# If FAIL_CMD is given, eval that upon failure. ++# FAIL_CMD may read-access the current command in variable CMD! ++func_execute_cmds () ++{ ++ $opt_debug ++ save_ifs=$IFS; IFS='~' ++ for cmd in $1; do ++ IFS=$save_ifs ++ eval cmd=\"$cmd\" ++ func_show_eval "$cmd" "${2-:}" ++ done ++ IFS=$save_ifs ++} ++ ++ ++# func_source file ++# Source FILE, adding directory component if necessary. ++# Note that it is not necessary on cygwin/mingw to append a dot to ++# FILE even if both FILE and FILE.exe exist: automatic-append-.exe ++# behavior happens only for exec(3), not for open(2)! Also, sourcing ++# `FILE.' does not work on cygwin managed mounts. ++func_source () ++{ ++ $opt_debug ++ case $1 in ++ */* | *\\*) . "$1" ;; ++ *) . "./$1" ;; ++ esac ++} ++ ++ ++# func_infer_tag arg ++# Infer tagged configuration to use if any are available and ++# if one wasn't chosen via the "--tag" command line option. ++# Only attempt this if the compiler in the base compile ++# command doesn't match the default compiler. ++# arg is usually of the form 'gcc ...' ++func_infer_tag () ++{ ++ $opt_debug ++ if test -n "$available_tags" && test -z "$tagname"; then ++ CC_quoted= ++ for arg in $CC; do ++ func_quote_for_eval "$arg" ++ CC_quoted="$CC_quoted $func_quote_for_eval_result" ++ done ++ case $@ in ++ # Blanks in the command may have been stripped by the calling shell, ++ # but not from the CC environment variable when configure was run. ++ " $CC "* | "$CC "* | " `$ECHO $CC` "* | "`$ECHO $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$ECHO $CC_quoted` "* | "`$ECHO $CC_quoted` "*) ;; ++ # Blanks at the start of $base_compile will cause this to fail ++ # if we don't check for them as well. ++ *) ++ for z in $available_tags; do ++ if $GREP "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$progpath" > /dev/null; then ++ # Evaluate the configuration. ++ eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $progpath`" ++ CC_quoted= ++ for arg in $CC; do ++ # Double-quote args containing other shell metacharacters. ++ func_quote_for_eval "$arg" ++ CC_quoted="$CC_quoted $func_quote_for_eval_result" ++ done ++ case "$@ " in ++ " $CC "* | "$CC "* | " `$ECHO $CC` "* | "`$ECHO $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$ECHO $CC_quoted` "* | "`$ECHO $CC_quoted` "*) ++ # The compiler in the base compile command matches ++ # the one in the tagged configuration. ++ # Assume this is the tagged configuration we want. ++ tagname=$z ++ break ++ ;; ++ esac ++ fi ++ done ++ # If $tagname still isn't set, then no tagged configuration ++ # was found and let the user know that the "--tag" command ++ # line option must be used. ++ if test -z "$tagname"; then ++ func_echo "unable to infer tagged configuration" ++ func_fatal_error "specify a tag with \`--tag'" ++# else ++# func_verbose "using $tagname tagged configuration" ++ fi ++ ;; ++ esac ++ fi ++} ++ ++ ++ ++# func_write_libtool_object output_name pic_name nonpic_name ++# Create a libtool object file (analogous to a ".la" file), ++# but don't create it if we're doing a dry run. ++func_write_libtool_object () ++{ ++ write_libobj=${1} ++ if test "$build_libtool_libs" = yes; then ++ write_lobj=\'${2}\' ++ else ++ write_lobj=none ++ fi ++ ++ if test "$build_old_libs" = yes; then ++ write_oldobj=\'${3}\' ++ else ++ write_oldobj=none ++ fi ++ ++ $opt_dry_run || { ++ cat >${write_libobj}T <<EOF ++# $write_libobj - a libtool object file ++# Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION ++# ++# Please DO NOT delete this file! ++# It is necessary for linking the library. ++ ++# Name of the PIC object. ++pic_object=$write_lobj ++ ++# Name of the non-PIC object ++non_pic_object=$write_oldobj ++ ++EOF ++ $MV "${write_libobj}T" "${write_libobj}" ++ } ++} ++ ++# func_mode_compile arg... ++func_mode_compile () ++{ ++ $opt_debug ++ # Get the compilation command and the source file. ++ base_compile= ++ srcfile="$nonopt" # always keep a non-empty value in "srcfile" ++ suppress_opt=yes ++ suppress_output= ++ arg_mode=normal ++ libobj= ++ later= ++ pie_flag= ++ ++ for arg ++ do ++ case $arg_mode in ++ arg ) ++ # do not "continue". Instead, add this to base_compile ++ lastarg="$arg" ++ arg_mode=normal ++ ;; ++ ++ target ) ++ libobj="$arg" ++ arg_mode=normal ++ continue ++ ;; ++ ++ normal ) ++ # Accept any command-line options. ++ case $arg in ++ -o) ++ test -n "$libobj" && \ ++ func_fatal_error "you cannot specify \`-o' more than once" ++ arg_mode=target ++ continue ++ ;; ++ ++ -pie | -fpie | -fPIE) ++ pie_flag="$pie_flag $arg" ++ continue ++ ;; ++ ++ -shared | -static | -prefer-pic | -prefer-non-pic) ++ later="$later $arg" ++ continue ++ ;; ++ ++ -no-suppress) ++ suppress_opt=no ++ continue ++ ;; ++ ++ -Xcompiler) ++ arg_mode=arg # the next one goes into the "base_compile" arg list ++ continue # The current "srcfile" will either be retained or ++ ;; # replaced later. I would guess that would be a bug. ++ ++ -Wc,*) ++ func_stripname '-Wc,' '' "$arg" ++ args=$func_stripname_result ++ lastarg= ++ save_ifs="$IFS"; IFS=',' ++ for arg in $args; do ++ IFS="$save_ifs" ++ func_quote_for_eval "$arg" ++ lastarg="$lastarg $func_quote_for_eval_result" ++ done ++ IFS="$save_ifs" ++ func_stripname ' ' '' "$lastarg" ++ lastarg=$func_stripname_result ++ ++ # Add the arguments to base_compile. ++ base_compile="$base_compile $lastarg" ++ continue ++ ;; ++ ++ *) ++ # Accept the current argument as the source file. ++ # The previous "srcfile" becomes the current argument. ++ # ++ lastarg="$srcfile" ++ srcfile="$arg" ++ ;; ++ esac # case $arg ++ ;; ++ esac # case $arg_mode ++ ++ # Aesthetically quote the previous argument. ++ func_quote_for_eval "$lastarg" ++ base_compile="$base_compile $func_quote_for_eval_result" ++ done # for arg ++ ++ case $arg_mode in ++ arg) ++ func_fatal_error "you must specify an argument for -Xcompile" ++ ;; ++ target) ++ func_fatal_error "you must specify a target with \`-o'" ++ ;; ++ *) ++ # Get the name of the library object. ++ test -z "$libobj" && { ++ func_basename "$srcfile" ++ libobj="$func_basename_result" ++ } ++ ;; ++ esac ++ ++ # Recognize several different file suffixes. ++ # If the user specifies -o file.o, it is replaced with file.lo ++ case $libobj in ++ *.[cCFSifmso] | \ ++ *.ada | *.adb | *.ads | *.asm | \ ++ *.c++ | *.cc | *.ii | *.class | *.cpp | *.cxx | \ ++ *.[fF][09]? | *.for | *.java | *.obj | *.sx) ++ func_xform "$libobj" ++ libobj=$func_xform_result ++ ;; ++ esac ++ ++ case $libobj in ++ *.lo) func_lo2o "$libobj"; obj=$func_lo2o_result ;; ++ *) ++ func_fatal_error "cannot determine name of library object from \`$libobj'" ++ ;; ++ esac ++ ++ func_infer_tag $base_compile ++ ++ for arg in $later; do ++ case $arg in ++ -shared) ++ test "$build_libtool_libs" != yes && \ ++ func_fatal_configuration "can not build a shared library" ++ build_old_libs=no ++ continue ++ ;; ++ ++ -static) ++ build_libtool_libs=no ++ build_old_libs=yes ++ continue ++ ;; ++ ++ -prefer-pic) ++ pic_mode=yes ++ continue ++ ;; ++ ++ -prefer-non-pic) ++ pic_mode=no ++ continue ++ ;; ++ esac ++ done ++ ++ func_quote_for_eval "$libobj" ++ test "X$libobj" != "X$func_quote_for_eval_result" \ ++ && $ECHO "X$libobj" | $GREP '[]~#^*{};<>?"'"'"' &()|`$[]' \ ++ && func_warning "libobj name \`$libobj' may not contain shell special characters." ++ func_dirname_and_basename "$obj" "/" "" ++ objname="$func_basename_result" ++ xdir="$func_dirname_result" ++ lobj=${xdir}$objdir/$objname ++ ++ test -z "$base_compile" && \ ++ func_fatal_help "you must specify a compilation command" ++ ++ # Delete any leftover library objects. ++ if test "$build_old_libs" = yes; then ++ removelist="$obj $lobj $libobj ${libobj}T" ++ else ++ removelist="$lobj $libobj ${libobj}T" ++ fi ++ ++ # On Cygwin there's no "real" PIC flag so we must build both object types ++ case $host_os in ++ cygwin* | mingw* | pw32* | os2* | cegcc*) ++ pic_mode=default ++ ;; ++ esac ++ if test "$pic_mode" = no && test "$deplibs_check_method" != pass_all; then ++ # non-PIC code in shared libraries is not supported ++ pic_mode=default ++ fi ++ ++ # Calculate the filename of the output object if compiler does ++ # not support -o with -c ++ if test "$compiler_c_o" = no; then ++ output_obj=`$ECHO "X$srcfile" | $Xsed -e 's%^.*/%%' -e 's%\.[^.]*$%%'`.${objext} ++ lockfile="$output_obj.lock" ++ else ++ output_obj= ++ need_locks=no ++ lockfile= ++ fi ++ ++ # Lock this critical section if it is needed ++ # We use this script file to make the link, it avoids creating a new file ++ if test "$need_locks" = yes; then ++ until $opt_dry_run || ln "$progpath" "$lockfile" 2>/dev/null; do ++ func_echo "Waiting for $lockfile to be removed" ++ sleep 2 ++ done ++ elif test "$need_locks" = warn; then ++ if test -f "$lockfile"; then ++ $ECHO "\ ++*** ERROR, $lockfile exists and contains: ++`cat $lockfile 2>/dev/null` ++ ++This indicates that another process is trying to use the same ++temporary object file, and libtool could not work around it because ++your compiler does not support \`-c' and \`-o' together. If you ++repeat this compilation, it may succeed, by chance, but you had better ++avoid parallel builds (make -j) in this platform, or get a better ++compiler." ++ ++ $opt_dry_run || $RM $removelist ++ exit $EXIT_FAILURE ++ fi ++ removelist="$removelist $output_obj" ++ $ECHO "$srcfile" > "$lockfile" ++ fi ++ ++ $opt_dry_run || $RM $removelist ++ removelist="$removelist $lockfile" ++ trap '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE' 1 2 15 ++ ++ if test -n "$fix_srcfile_path"; then ++ eval srcfile=\"$fix_srcfile_path\" ++ fi ++ func_quote_for_eval "$srcfile" ++ qsrcfile=$func_quote_for_eval_result ++ ++ # Only build a PIC object if we are building libtool libraries. ++ if test "$build_libtool_libs" = yes; then ++ # Without this assignment, base_compile gets emptied. ++ fbsd_hideous_sh_bug=$base_compile ++ ++ if test "$pic_mode" != no; then ++ command="$base_compile $qsrcfile $pic_flag" ++ else ++ # Don't build PIC code ++ command="$base_compile $qsrcfile" ++ fi ++ ++ func_mkdir_p "$xdir$objdir" ++ ++ if test -z "$output_obj"; then ++ # Place PIC objects in $objdir ++ command="$command -o $lobj" ++ fi ++ ++ func_show_eval_locale "$command" \ ++ 'test -n "$output_obj" && $RM $removelist; exit $EXIT_FAILURE' ++ ++ if test "$need_locks" = warn && ++ test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then ++ $ECHO "\ ++*** ERROR, $lockfile contains: ++`cat $lockfile 2>/dev/null` ++ ++but it should contain: ++$srcfile ++ ++This indicates that another process is trying to use the same ++temporary object file, and libtool could not work around it because ++your compiler does not support \`-c' and \`-o' together. If you ++repeat this compilation, it may succeed, by chance, but you had better ++avoid parallel builds (make -j) in this platform, or get a better ++compiler." ++ ++ $opt_dry_run || $RM $removelist ++ exit $EXIT_FAILURE ++ fi ++ ++ # Just move the object if needed, then go on to compile the next one ++ if test -n "$output_obj" && test "X$output_obj" != "X$lobj"; then ++ func_show_eval '$MV "$output_obj" "$lobj"' \ ++ 'error=$?; $opt_dry_run || $RM $removelist; exit $error' ++ fi ++ ++ # Allow error messages only from the first compilation. ++ if test "$suppress_opt" = yes; then ++ suppress_output=' >/dev/null 2>&1' ++ fi ++ fi ++ ++ # Only build a position-dependent object if we build old libraries. ++ if test "$build_old_libs" = yes; then ++ if test "$pic_mode" != yes; then ++ # Don't build PIC code ++ command="$base_compile $qsrcfile$pie_flag" ++ else ++ command="$base_compile $qsrcfile $pic_flag" ++ fi ++ if test "$compiler_c_o" = yes; then ++ command="$command -o $obj" ++ fi ++ ++ # Suppress compiler output if we already did a PIC compilation. ++ command="$command$suppress_output" ++ func_show_eval_locale "$command" \ ++ '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE' ++ ++ if test "$need_locks" = warn && ++ test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then ++ $ECHO "\ ++*** ERROR, $lockfile contains: ++`cat $lockfile 2>/dev/null` ++ ++but it should contain: ++$srcfile ++ ++This indicates that another process is trying to use the same ++temporary object file, and libtool could not work around it because ++your compiler does not support \`-c' and \`-o' together. If you ++repeat this compilation, it may succeed, by chance, but you had better ++avoid parallel builds (make -j) in this platform, or get a better ++compiler." ++ ++ $opt_dry_run || $RM $removelist ++ exit $EXIT_FAILURE ++ fi ++ ++ # Just move the object if needed ++ if test -n "$output_obj" && test "X$output_obj" != "X$obj"; then ++ func_show_eval '$MV "$output_obj" "$obj"' \ ++ 'error=$?; $opt_dry_run || $RM $removelist; exit $error' ++ fi ++ fi ++ ++ $opt_dry_run || { ++ func_write_libtool_object "$libobj" "$objdir/$objname" "$objname" ++ ++ # Unlock the critical section if it was locked ++ if test "$need_locks" != no; then ++ removelist=$lockfile ++ $RM "$lockfile" ++ fi ++ } ++ ++ exit $EXIT_SUCCESS ++} ++ ++$opt_help || { ++test "$mode" = compile && func_mode_compile ${1+"$@"} ++} ++ ++func_mode_help () ++{ ++ # We need to display help for each of the modes. ++ case $mode in ++ "") ++ # Generic help is extracted from the usage comments ++ # at the start of this file. ++ func_help ++ ;; ++ ++ clean) ++ $ECHO \ ++"Usage: $progname [OPTION]... --mode=clean RM [RM-OPTION]... FILE... ++ ++Remove files from the build directory. ++ ++RM is the name of the program to use to delete files associated with each FILE ++(typically \`/bin/rm'). RM-OPTIONS are options (such as \`-f') to be passed ++to RM. ++ ++If FILE is a libtool library, object or program, all the files associated ++with it are deleted. Otherwise, only FILE itself is deleted using RM." ++ ;; ++ ++ compile) ++ $ECHO \ ++"Usage: $progname [OPTION]... --mode=compile COMPILE-COMMAND... SOURCEFILE ++ ++Compile a source file into a libtool library object. ++ ++This mode accepts the following additional options: ++ ++ -o OUTPUT-FILE set the output file name to OUTPUT-FILE ++ -no-suppress do not suppress compiler output for multiple passes ++ -prefer-pic try to building PIC objects only ++ -prefer-non-pic try to building non-PIC objects only ++ -shared do not build a \`.o' file suitable for static linking ++ -static only build a \`.o' file suitable for static linking ++ ++COMPILE-COMMAND is a command to be used in creating a \`standard' object file ++from the given SOURCEFILE. ++ ++The output file name is determined by removing the directory component from ++SOURCEFILE, then substituting the C source code suffix \`.c' with the ++library object suffix, \`.lo'." ++ ;; ++ ++ execute) ++ $ECHO \ ++"Usage: $progname [OPTION]... --mode=execute COMMAND [ARGS]... ++ ++Automatically set library path, then run a program. ++ ++This mode accepts the following additional options: ++ ++ -dlopen FILE add the directory containing FILE to the library path ++ ++This mode sets the library path environment variable according to \`-dlopen' ++flags. ++ ++If any of the ARGS are libtool executable wrappers, then they are translated ++into their corresponding uninstalled binary, and any of their required library ++directories are added to the library path. ++ ++Then, COMMAND is executed, with ARGS as arguments." ++ ;; ++ ++ finish) ++ $ECHO \ ++"Usage: $progname [OPTION]... --mode=finish [LIBDIR]... ++ ++Complete the installation of libtool libraries. ++ ++Each LIBDIR is a directory that contains libtool libraries. ++ ++The commands that this mode executes may require superuser privileges. Use ++the \`--dry-run' option if you just want to see what would be executed." ++ ;; ++ ++ install) ++ $ECHO \ ++"Usage: $progname [OPTION]... --mode=install INSTALL-COMMAND... ++ ++Install executables or libraries. ++ ++INSTALL-COMMAND is the installation command. The first component should be ++either the \`install' or \`cp' program. ++ ++The following components of INSTALL-COMMAND are treated specially: ++ ++ -inst-prefix PREFIX-DIR Use PREFIX-DIR as a staging area for installation ++ ++The rest of the components are interpreted as arguments to that command (only ++BSD-compatible install options are recognized)." ++ ;; ++ ++ link) ++ $ECHO \ ++"Usage: $progname [OPTION]... --mode=link LINK-COMMAND... ++ ++Link object files or libraries together to form another library, or to ++create an executable program. ++ ++LINK-COMMAND is a command using the C compiler that you would use to create ++a program from several object files. ++ ++The following components of LINK-COMMAND are treated specially: ++ ++ -all-static do not do any dynamic linking at all ++ -avoid-version do not add a version suffix if possible ++ -dlopen FILE \`-dlpreopen' FILE if it cannot be dlopened at runtime ++ -dlpreopen FILE link in FILE and add its symbols to lt_preloaded_symbols ++ -export-dynamic allow symbols from OUTPUT-FILE to be resolved with dlsym(3) ++ -export-symbols SYMFILE ++ try to export only the symbols listed in SYMFILE ++ -export-symbols-regex REGEX ++ try to export only the symbols matching REGEX ++ -LLIBDIR search LIBDIR for required installed libraries ++ -lNAME OUTPUT-FILE requires the installed library libNAME ++ -module build a library that can dlopened ++ -no-fast-install disable the fast-install mode ++ -no-install link a not-installable executable ++ -no-undefined declare that a library does not refer to external symbols ++ -o OUTPUT-FILE create OUTPUT-FILE from the specified objects ++ -objectlist FILE Use a list of object files found in FILE to specify objects ++ -precious-files-regex REGEX ++ don't remove output files matching REGEX ++ -release RELEASE specify package release information ++ -rpath LIBDIR the created library will eventually be installed in LIBDIR ++ -R[ ]LIBDIR add LIBDIR to the runtime path of programs and libraries ++ -shared only do dynamic linking of libtool libraries ++ -shrext SUFFIX override the standard shared library file extension ++ -static do not do any dynamic linking of uninstalled libtool libraries ++ -static-libtool-libs ++ do not do any dynamic linking of libtool libraries ++ -version-info CURRENT[:REVISION[:AGE]] ++ specify library version info [each variable defaults to 0] ++ -weak LIBNAME declare that the target provides the LIBNAME interface ++ ++All other options (arguments beginning with \`-') are ignored. ++ ++Every other argument is treated as a filename. Files ending in \`.la' are ++treated as uninstalled libtool libraries, other files are standard or library ++object files. ++ ++If the OUTPUT-FILE ends in \`.la', then a libtool library is created, ++only library objects (\`.lo' files) may be specified, and \`-rpath' is ++required, except when creating a convenience library. ++ ++If OUTPUT-FILE ends in \`.a' or \`.lib', then a standard library is created ++using \`ar' and \`ranlib', or on Windows using \`lib'. ++ ++If OUTPUT-FILE ends in \`.lo' or \`.${objext}', then a reloadable object file ++is created, otherwise an executable program is created." ++ ;; ++ ++ uninstall) ++ $ECHO \ ++"Usage: $progname [OPTION]... --mode=uninstall RM [RM-OPTION]... FILE... ++ ++Remove libraries from an installation directory. ++ ++RM is the name of the program to use to delete files associated with each FILE ++(typically \`/bin/rm'). RM-OPTIONS are options (such as \`-f') to be passed ++to RM. ++ ++If FILE is a libtool library, all the files associated with it are deleted. ++Otherwise, only FILE itself is deleted using RM." ++ ;; ++ ++ *) ++ func_fatal_help "invalid operation mode \`$mode'" ++ ;; ++ esac ++ ++ $ECHO ++ $ECHO "Try \`$progname --help' for more information about other modes." ++ ++ exit $? ++} ++ ++ # Now that we've collected a possible --mode arg, show help if necessary ++ $opt_help && func_mode_help ++ ++ ++# func_mode_execute arg... ++func_mode_execute () ++{ ++ $opt_debug ++ # The first argument is the command name. ++ cmd="$nonopt" ++ test -z "$cmd" && \ ++ func_fatal_help "you must specify a COMMAND" ++ ++ # Handle -dlopen flags immediately. ++ for file in $execute_dlfiles; do ++ test -f "$file" \ ++ || func_fatal_help "\`$file' is not a file" ++ ++ dir= ++ case $file in ++ *.la) ++ # Check to see that this really is a libtool archive. ++ func_lalib_unsafe_p "$file" \ ++ || func_fatal_help "\`$lib' is not a valid libtool archive" ++ ++ # Read the libtool library. ++ dlname= ++ library_names= ++ func_source "$file" ++ ++ # Skip this library if it cannot be dlopened. ++ if test -z "$dlname"; then ++ # Warn if it was a shared library. ++ test -n "$library_names" && \ ++ func_warning "\`$file' was not linked with \`-export-dynamic'" ++ continue ++ fi ++ ++ func_dirname "$file" "" "." ++ dir="$func_dirname_result" ++ ++ if test -f "$dir/$objdir/$dlname"; then ++ dir="$dir/$objdir" ++ else ++ if test ! -f "$dir/$dlname"; then ++ func_fatal_error "cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" ++ fi ++ fi ++ ;; ++ ++ *.lo) ++ # Just add the directory containing the .lo file. ++ func_dirname "$file" "" "." ++ dir="$func_dirname_result" ++ ;; ++ ++ *) ++ func_warning "\`-dlopen' is ignored for non-libtool libraries and objects" ++ continue ++ ;; ++ esac ++ ++ # Get the absolute pathname. ++ absdir=`cd "$dir" && pwd` ++ test -n "$absdir" && dir="$absdir" ++ ++ # Now add the directory to shlibpath_var. ++ if eval "test -z \"\$$shlibpath_var\""; then ++ eval "$shlibpath_var=\"\$dir\"" ++ else ++ eval "$shlibpath_var=\"\$dir:\$$shlibpath_var\"" ++ fi ++ done ++ ++ # This variable tells wrapper scripts just to set shlibpath_var ++ # rather than running their programs. ++ libtool_execute_magic="$magic" ++ ++ # Check if any of the arguments is a wrapper script. ++ args= ++ for file ++ do ++ case $file in ++ -*) ;; ++ *) ++ # Do a test to see if this is really a libtool program. ++ if func_ltwrapper_script_p "$file"; then ++ func_source "$file" ++ # Transform arg to wrapped name. ++ file="$progdir/$program" ++ elif func_ltwrapper_executable_p "$file"; then ++ func_ltwrapper_scriptname "$file" ++ func_source "$func_ltwrapper_scriptname_result" ++ # Transform arg to wrapped name. ++ file="$progdir/$program" ++ fi ++ ;; ++ esac ++ # Quote arguments (to preserve shell metacharacters). ++ func_quote_for_eval "$file" ++ args="$args $func_quote_for_eval_result" ++ done ++ ++ if test "X$opt_dry_run" = Xfalse; then ++ if test -n "$shlibpath_var"; then ++ # Export the shlibpath_var. ++ eval "export $shlibpath_var" ++ fi ++ ++ # Restore saved environment variables ++ for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES ++ do ++ eval "if test \"\${save_$lt_var+set}\" = set; then ++ $lt_var=\$save_$lt_var; export $lt_var ++ else ++ $lt_unset $lt_var ++ fi" ++ done ++ ++ # Now prepare to actually exec the command. ++ exec_cmd="\$cmd$args" ++ else ++ # Display what would be done. ++ if test -n "$shlibpath_var"; then ++ eval "\$ECHO \"\$shlibpath_var=\$$shlibpath_var\"" ++ $ECHO "export $shlibpath_var" ++ fi ++ $ECHO "$cmd$args" ++ exit $EXIT_SUCCESS ++ fi ++} ++ ++test "$mode" = execute && func_mode_execute ${1+"$@"} ++ ++ ++# func_mode_finish arg... ++func_mode_finish () ++{ ++ $opt_debug ++ libdirs="$nonopt" ++ admincmds= ++ ++ if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then ++ for dir ++ do ++ libdirs="$libdirs $dir" ++ done ++ ++ for libdir in $libdirs; do ++ if test -n "$finish_cmds"; then ++ # Do each command in the finish commands. ++ func_execute_cmds "$finish_cmds" 'admincmds="$admincmds ++'"$cmd"'"' ++ fi ++ if test -n "$finish_eval"; then ++ # Do the single finish_eval. ++ eval cmds=\"$finish_eval\" ++ $opt_dry_run || eval "$cmds" || admincmds="$admincmds ++ $cmds" ++ fi ++ done ++ fi ++ ++ # Exit here if they wanted silent mode. ++ $opt_silent && exit $EXIT_SUCCESS ++ ++ $ECHO "X----------------------------------------------------------------------" | $Xsed ++ $ECHO "Libraries have been installed in:" ++ for libdir in $libdirs; do ++ $ECHO " $libdir" ++ done ++ $ECHO ++ $ECHO "If you ever happen to want to link against installed libraries" ++ $ECHO "in a given directory, LIBDIR, you must either use libtool, and" ++ $ECHO "specify the full pathname of the library, or use the \`-LLIBDIR'" ++ $ECHO "flag during linking and do at least one of the following:" ++ if test -n "$shlibpath_var"; then ++ $ECHO " - add LIBDIR to the \`$shlibpath_var' environment variable" ++ $ECHO " during execution" ++ fi ++ if test -n "$runpath_var"; then ++ $ECHO " - add LIBDIR to the \`$runpath_var' environment variable" ++ $ECHO " during linking" ++ fi ++ if test -n "$hardcode_libdir_flag_spec"; then ++ libdir=LIBDIR ++ eval flag=\"$hardcode_libdir_flag_spec\" ++ ++ $ECHO " - use the \`$flag' linker flag" ++ fi ++ if test -n "$admincmds"; then ++ $ECHO " - have your system administrator run these commands:$admincmds" ++ fi ++ if test -f /etc/ld.so.conf; then ++ $ECHO " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'" ++ fi ++ $ECHO ++ ++ $ECHO "See any operating system documentation about shared libraries for" ++ case $host in ++ solaris2.[6789]|solaris2.1[0-9]) ++ $ECHO "more information, such as the ld(1), crle(1) and ld.so(8) manual" ++ $ECHO "pages." ++ ;; ++ *) ++ $ECHO "more information, such as the ld(1) and ld.so(8) manual pages." ++ ;; ++ esac ++ $ECHO "X----------------------------------------------------------------------" | $Xsed ++ exit $EXIT_SUCCESS ++} ++ ++test "$mode" = finish && func_mode_finish ${1+"$@"} ++ ++ ++# func_mode_install arg... ++func_mode_install () ++{ ++ $opt_debug ++ # There may be an optional sh(1) argument at the beginning of ++ # install_prog (especially on Windows NT). ++ if test "$nonopt" = "$SHELL" || test "$nonopt" = /bin/sh || ++ # Allow the use of GNU shtool's install command. ++ $ECHO "X$nonopt" | $GREP shtool >/dev/null; then ++ # Aesthetically quote it. ++ func_quote_for_eval "$nonopt" ++ install_prog="$func_quote_for_eval_result " ++ arg=$1 ++ shift ++ else ++ install_prog= ++ arg=$nonopt ++ fi ++ ++ # The real first argument should be the name of the installation program. ++ # Aesthetically quote it. ++ func_quote_for_eval "$arg" ++ install_prog="$install_prog$func_quote_for_eval_result" ++ ++ # We need to accept at least all the BSD install flags. ++ dest= ++ files= ++ opts= ++ prev= ++ install_type= ++ isdir=no ++ stripme= ++ for arg ++ do ++ if test -n "$dest"; then ++ files="$files $dest" ++ dest=$arg ++ continue ++ fi ++ ++ case $arg in ++ -d) isdir=yes ;; ++ -f) ++ case " $install_prog " in ++ *[\\\ /]cp\ *) ;; ++ *) prev=$arg ;; ++ esac ++ ;; ++ -g | -m | -o) ++ prev=$arg ++ ;; ++ -s) ++ stripme=" -s" ++ continue ++ ;; ++ -*) ++ ;; ++ *) ++ # If the previous option needed an argument, then skip it. ++ if test -n "$prev"; then ++ prev= ++ else ++ dest=$arg ++ continue ++ fi ++ ;; ++ esac ++ ++ # Aesthetically quote the argument. ++ func_quote_for_eval "$arg" ++ install_prog="$install_prog $func_quote_for_eval_result" ++ done ++ ++ test -z "$install_prog" && \ ++ func_fatal_help "you must specify an install program" ++ ++ test -n "$prev" && \ ++ func_fatal_help "the \`$prev' option requires an argument" ++ ++ if test -z "$files"; then ++ if test -z "$dest"; then ++ func_fatal_help "no file or destination specified" ++ else ++ func_fatal_help "you must specify a destination" ++ fi ++ fi ++ ++ # Strip any trailing slash from the destination. ++ func_stripname '' '/' "$dest" ++ dest=$func_stripname_result ++ ++ # Check to see that the destination is a directory. ++ test -d "$dest" && isdir=yes ++ if test "$isdir" = yes; then ++ destdir="$dest" ++ destname= ++ else ++ func_dirname_and_basename "$dest" "" "." ++ destdir="$func_dirname_result" ++ destname="$func_basename_result" ++ ++ # Not a directory, so check to see that there is only one file specified. ++ set dummy $files; shift ++ test "$#" -gt 1 && \ ++ func_fatal_help "\`$dest' is not a directory" ++ fi ++ case $destdir in ++ [\\/]* | [A-Za-z]:[\\/]*) ;; ++ *) ++ for file in $files; do ++ case $file in ++ *.lo) ;; ++ *) ++ func_fatal_help "\`$destdir' must be an absolute directory name" ++ ;; ++ esac ++ done ++ ;; ++ esac ++ ++ # This variable tells wrapper scripts just to set variables rather ++ # than running their programs. ++ libtool_install_magic="$magic" ++ ++ staticlibs= ++ future_libdirs= ++ current_libdirs= ++ for file in $files; do ++ ++ # Do each installation. ++ case $file in ++ *.$libext) ++ # Do the static libraries later. ++ staticlibs="$staticlibs $file" ++ ;; ++ ++ *.la) ++ # Check to see that this really is a libtool archive. ++ func_lalib_unsafe_p "$file" \ ++ || func_fatal_help "\`$file' is not a valid libtool archive" ++ ++ library_names= ++ old_library= ++ relink_command= ++ func_source "$file" ++ ++ # Add the libdir to current_libdirs if it is the destination. ++ if test "X$destdir" = "X$libdir"; then ++ case "$current_libdirs " in ++ *" $libdir "*) ;; ++ *) current_libdirs="$current_libdirs $libdir" ;; ++ esac ++ else ++ # Note the libdir as a future libdir. ++ case "$future_libdirs " in ++ *" $libdir "*) ;; ++ *) future_libdirs="$future_libdirs $libdir" ;; ++ esac ++ fi ++ ++ func_dirname "$file" "/" "" ++ dir="$func_dirname_result" ++ dir="$dir$objdir" ++ ++ if test -n "$relink_command"; then ++ # Determine the prefix the user has applied to our future dir. ++ inst_prefix_dir=`$ECHO "X$destdir" | $Xsed -e "s%$libdir\$%%"` ++ ++ # Don't allow the user to place us outside of our expected ++ # location b/c this prevents finding dependent libraries that ++ # are installed to the same prefix. ++ # At present, this check doesn't affect windows .dll's that ++ # are installed into $libdir/../bin (currently, that works fine) ++ # but it's something to keep an eye on. ++ test "$inst_prefix_dir" = "$destdir" && \ ++ func_fatal_error "error: cannot install \`$file' to a directory not ending in $libdir" ++ ++ if test -n "$inst_prefix_dir"; then ++ # Stick the inst_prefix_dir data into the link command. ++ relink_command=`$ECHO "X$relink_command" | $Xsed -e "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"` ++ else ++ relink_command=`$ECHO "X$relink_command" | $Xsed -e "s%@inst_prefix_dir@%%"` ++ fi ++ ++ func_warning "relinking \`$file'" ++ func_show_eval "$relink_command" \ ++ 'func_fatal_error "error: relink \`$file'\'' with the above command before installing it"' ++ fi ++ ++ # See the names of the shared library. ++ set dummy $library_names; shift ++ if test -n "$1"; then ++ realname="$1" ++ shift ++ ++ srcname="$realname" ++ test -n "$relink_command" && srcname="$realname"T ++ ++ # Install the shared library and build the symlinks. ++ func_show_eval "$install_prog $dir/$srcname $destdir/$realname" \ ++ 'exit $?' ++ tstripme="$stripme" ++ case $host_os in ++ cygwin* | mingw* | pw32* | cegcc*) ++ case $realname in ++ *.dll.a) ++ tstripme="" ++ ;; ++ esac ++ ;; ++ esac ++ if test -n "$tstripme" && test -n "$striplib"; then ++ func_show_eval "$striplib $destdir/$realname" 'exit $?' ++ fi ++ ++ if test "$#" -gt 0; then ++ # Delete the old symlinks, and create new ones. ++ # Try `ln -sf' first, because the `ln' binary might depend on ++ # the symlink we replace! Solaris /bin/ln does not understand -f, ++ # so we also need to try rm && ln -s. ++ for linkname ++ do ++ test "$linkname" != "$realname" \ ++ && func_show_eval "(cd $destdir && { $LN_S -f $realname $linkname || { $RM $linkname && $LN_S $realname $linkname; }; })" ++ done ++ fi ++ ++ # Do each command in the postinstall commands. ++ lib="$destdir/$realname" ++ func_execute_cmds "$postinstall_cmds" 'exit $?' ++ fi ++ ++ # Install the pseudo-library for information purposes. ++ func_basename "$file" ++ name="$func_basename_result" ++ instname="$dir/$name"i ++ func_show_eval "$install_prog $instname $destdir/$name" 'exit $?' ++ ++ # Maybe install the static library, too. ++ test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library" ++ ;; ++ ++ *.lo) ++ # Install (i.e. copy) a libtool object. ++ ++ # Figure out destination file name, if it wasn't already specified. ++ if test -n "$destname"; then ++ destfile="$destdir/$destname" ++ else ++ func_basename "$file" ++ destfile="$func_basename_result" ++ destfile="$destdir/$destfile" ++ fi ++ ++ # Deduce the name of the destination old-style object file. ++ case $destfile in ++ *.lo) ++ func_lo2o "$destfile" ++ staticdest=$func_lo2o_result ++ ;; ++ *.$objext) ++ staticdest="$destfile" ++ destfile= ++ ;; ++ *) ++ func_fatal_help "cannot copy a libtool object to \`$destfile'" ++ ;; ++ esac ++ ++ # Install the libtool object if requested. ++ test -n "$destfile" && \ ++ func_show_eval "$install_prog $file $destfile" 'exit $?' ++ ++ # Install the old object if enabled. ++ if test "$build_old_libs" = yes; then ++ # Deduce the name of the old-style object file. ++ func_lo2o "$file" ++ staticobj=$func_lo2o_result ++ func_show_eval "$install_prog \$staticobj \$staticdest" 'exit $?' ++ fi ++ exit $EXIT_SUCCESS ++ ;; ++ ++ *) ++ # Figure out destination file name, if it wasn't already specified. ++ if test -n "$destname"; then ++ destfile="$destdir/$destname" ++ else ++ func_basename "$file" ++ destfile="$func_basename_result" ++ destfile="$destdir/$destfile" ++ fi ++ ++ # If the file is missing, and there is a .exe on the end, strip it ++ # because it is most likely a libtool script we actually want to ++ # install ++ stripped_ext="" ++ case $file in ++ *.exe) ++ if test ! -f "$file"; then ++ func_stripname '' '.exe' "$file" ++ file=$func_stripname_result ++ stripped_ext=".exe" ++ fi ++ ;; ++ esac ++ ++ # Do a test to see if this is really a libtool program. ++ case $host in ++ *cygwin* | *mingw*) ++ if func_ltwrapper_executable_p "$file"; then ++ func_ltwrapper_scriptname "$file" ++ wrapper=$func_ltwrapper_scriptname_result ++ else ++ func_stripname '' '.exe' "$file" ++ wrapper=$func_stripname_result ++ fi ++ ;; ++ *) ++ wrapper=$file ++ ;; ++ esac ++ if func_ltwrapper_script_p "$wrapper"; then ++ notinst_deplibs= ++ relink_command= ++ ++ func_source "$wrapper" ++ ++ # Check the variables that should have been set. ++ test -z "$generated_by_libtool_version" && \ ++ func_fatal_error "invalid libtool wrapper script \`$wrapper'" ++ ++ finalize=yes ++ for lib in $notinst_deplibs; do ++ # Check to see that each library is installed. ++ libdir= ++ if test -f "$lib"; then ++ func_source "$lib" ++ fi ++ libfile="$libdir/"`$ECHO "X$lib" | $Xsed -e 's%^.*/%%g'` ### testsuite: skip nested quoting test ++ if test -n "$libdir" && test ! -f "$libfile"; then ++ func_warning "\`$lib' has not been installed in \`$libdir'" ++ finalize=no ++ fi ++ done ++ ++ relink_command= ++ func_source "$wrapper" ++ ++ outputname= ++ if test "$fast_install" = no && test -n "$relink_command"; then ++ $opt_dry_run || { ++ if test "$finalize" = yes; then ++ tmpdir=`func_mktempdir` ++ func_basename "$file$stripped_ext" ++ file="$func_basename_result" ++ outputname="$tmpdir/$file" ++ # Replace the output file specification. ++ relink_command=`$ECHO "X$relink_command" | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g'` ++ ++ $opt_silent || { ++ func_quote_for_expand "$relink_command" ++ eval "func_echo $func_quote_for_expand_result" ++ } ++ if eval "$relink_command"; then : ++ else ++ func_error "error: relink \`$file' with the above command before installing it" ++ $opt_dry_run || ${RM}r "$tmpdir" ++ continue ++ fi ++ file="$outputname" ++ else ++ func_warning "cannot relink \`$file'" ++ fi ++ } ++ else ++ # Install the binary that we compiled earlier. ++ file=`$ECHO "X$file$stripped_ext" | $Xsed -e "s%\([^/]*\)$%$objdir/\1%"` ++ fi ++ fi ++ ++ # remove .exe since cygwin /usr/bin/install will append another ++ # one anyway ++ case $install_prog,$host in ++ */usr/bin/install*,*cygwin*) ++ case $file:$destfile in ++ *.exe:*.exe) ++ # this is ok ++ ;; ++ *.exe:*) ++ destfile=$destfile.exe ++ ;; ++ *:*.exe) ++ func_stripname '' '.exe' "$destfile" ++ destfile=$func_stripname_result ++ ;; ++ esac ++ ;; ++ esac ++ func_show_eval "$install_prog\$stripme \$file \$destfile" 'exit $?' ++ $opt_dry_run || if test -n "$outputname"; then ++ ${RM}r "$tmpdir" ++ fi ++ ;; ++ esac ++ done ++ ++ for file in $staticlibs; do ++ func_basename "$file" ++ name="$func_basename_result" ++ ++ # Set up the ranlib parameters. ++ oldlib="$destdir/$name" ++ ++ func_show_eval "$install_prog \$file \$oldlib" 'exit $?' ++ ++ if test -n "$stripme" && test -n "$old_striplib"; then ++ func_show_eval "$old_striplib $oldlib" 'exit $?' ++ fi ++ ++ # Do each command in the postinstall commands. ++ func_execute_cmds "$old_postinstall_cmds" 'exit $?' ++ done ++ ++ test -n "$future_libdirs" && \ ++ func_warning "remember to run \`$progname --finish$future_libdirs'" ++ ++ if test -n "$current_libdirs"; then ++ # Maybe just do a dry run. ++ $opt_dry_run && current_libdirs=" -n$current_libdirs" ++ exec_cmd='$SHELL $progpath $preserve_args --finish$current_libdirs' ++ else ++ exit $EXIT_SUCCESS ++ fi ++} ++ ++test "$mode" = install && func_mode_install ${1+"$@"} ++ ++ ++# func_generate_dlsyms outputname originator pic_p ++# Extract symbols from dlprefiles and create ${outputname}S.o with ++# a dlpreopen symbol table. ++func_generate_dlsyms () ++{ ++ $opt_debug ++ my_outputname="$1" ++ my_originator="$2" ++ my_pic_p="${3-no}" ++ my_prefix=`$ECHO "$my_originator" | sed 's%[^a-zA-Z0-9]%_%g'` ++ my_dlsyms= ++ ++ if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then ++ if test -n "$NM" && test -n "$global_symbol_pipe"; then ++ my_dlsyms="${my_outputname}S.c" ++ else ++ func_error "not configured to extract global symbols from dlpreopened files" ++ fi ++ fi ++ ++ if test -n "$my_dlsyms"; then ++ case $my_dlsyms in ++ "") ;; ++ *.c) ++ # Discover the nlist of each of the dlfiles. ++ nlist="$output_objdir/${my_outputname}.nm" ++ ++ func_show_eval "$RM $nlist ${nlist}S ${nlist}T" ++ ++ # Parse the name list into a source file. ++ func_verbose "creating $output_objdir/$my_dlsyms" ++ ++ $opt_dry_run || $ECHO > "$output_objdir/$my_dlsyms" "\ ++/* $my_dlsyms - symbol resolution table for \`$my_outputname' dlsym emulation. */ ++/* Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION */ ++ ++#ifdef __cplusplus ++extern \"C\" { ++#endif ++ ++/* External symbol declarations for the compiler. */\ ++" ++ ++ if test "$dlself" = yes; then ++ func_verbose "generating symbol list for \`$output'" ++ ++ $opt_dry_run || echo ': @PROGRAM@ ' > "$nlist" ++ ++ # Add our own program objects to the symbol list. ++ progfiles=`$ECHO "X$objs$old_deplibs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP` ++ for progfile in $progfiles; do ++ func_verbose "extracting global C symbols from \`$progfile'" ++ $opt_dry_run || eval "$NM $progfile | $global_symbol_pipe >> '$nlist'" ++ done ++ ++ if test -n "$exclude_expsyms"; then ++ $opt_dry_run || { ++ eval '$EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T' ++ eval '$MV "$nlist"T "$nlist"' ++ } ++ fi ++ ++ if test -n "$export_symbols_regex"; then ++ $opt_dry_run || { ++ eval '$EGREP -e "$export_symbols_regex" "$nlist" > "$nlist"T' ++ eval '$MV "$nlist"T "$nlist"' ++ } ++ fi ++ ++ # Prepare the list of exported symbols ++ if test -z "$export_symbols"; then ++ export_symbols="$output_objdir/$outputname.exp" ++ $opt_dry_run || { ++ $RM $export_symbols ++ eval "${SED} -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"' ++ case $host in ++ *cygwin* | *mingw* | *cegcc* ) ++ eval "echo EXPORTS "'> "$output_objdir/$outputname.def"' ++ eval 'cat "$export_symbols" >> "$output_objdir/$outputname.def"' ++ ;; ++ esac ++ } ++ else ++ $opt_dry_run || { ++ eval "${SED} -e 's/\([].[*^$]\)/\\\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$outputname.exp"' ++ eval '$GREP -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T' ++ eval '$MV "$nlist"T "$nlist"' ++ case $host in ++ *cygwin | *mingw* | *cegcc* ) ++ eval "echo EXPORTS "'> "$output_objdir/$outputname.def"' ++ eval 'cat "$nlist" >> "$output_objdir/$outputname.def"' ++ ;; ++ esac ++ } ++ fi ++ fi ++ ++ for dlprefile in $dlprefiles; do ++ func_verbose "extracting global C symbols from \`$dlprefile'" ++ func_basename "$dlprefile" ++ name="$func_basename_result" ++ $opt_dry_run || { ++ eval '$ECHO ": $name " >> "$nlist"' ++ eval "$NM $dlprefile 2>/dev/null | $global_symbol_pipe >> '$nlist'" ++ } ++ done ++ ++ $opt_dry_run || { ++ # Make sure we have at least an empty file. ++ test -f "$nlist" || : > "$nlist" ++ ++ if test -n "$exclude_expsyms"; then ++ $EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T ++ $MV "$nlist"T "$nlist" ++ fi ++ ++ # Try sorting and uniquifying the output. ++ if $GREP -v "^: " < "$nlist" | ++ if sort -k 3 </dev/null >/dev/null 2>&1; then ++ sort -k 3 ++ else ++ sort +2 ++ fi | ++ uniq > "$nlist"S; then ++ : ++ else ++ $GREP -v "^: " < "$nlist" > "$nlist"S ++ fi ++ ++ if test -f "$nlist"S; then ++ eval "$global_symbol_to_cdecl"' < "$nlist"S >> "$output_objdir/$my_dlsyms"' ++ else ++ $ECHO '/* NONE */' >> "$output_objdir/$my_dlsyms" ++ fi ++ ++ $ECHO >> "$output_objdir/$my_dlsyms" "\ ++ ++/* The mapping between symbol names and symbols. */ ++typedef struct { ++ const char *name; ++ void *address; ++} lt_dlsymlist; ++" ++ case $host in ++ *cygwin* | *mingw* | *cegcc* ) ++ $ECHO >> "$output_objdir/$my_dlsyms" "\ ++/* DATA imports from DLLs on WIN32 con't be const, because ++ runtime relocations are performed -- see ld's documentation ++ on pseudo-relocs. */" ++ lt_dlsym_const= ;; ++ *osf5*) ++ echo >> "$output_objdir/$my_dlsyms" "\ ++/* This system does not cope well with relocations in const data */" ++ lt_dlsym_const= ;; ++ *) ++ lt_dlsym_const=const ;; ++ esac ++ ++ $ECHO >> "$output_objdir/$my_dlsyms" "\ ++extern $lt_dlsym_const lt_dlsymlist ++lt_${my_prefix}_LTX_preloaded_symbols[]; ++$lt_dlsym_const lt_dlsymlist ++lt_${my_prefix}_LTX_preloaded_symbols[] = ++{\ ++ { \"$my_originator\", (void *) 0 }," ++ ++ case $need_lib_prefix in ++ no) ++ eval "$global_symbol_to_c_name_address" < "$nlist" >> "$output_objdir/$my_dlsyms" ++ ;; ++ *) ++ eval "$global_symbol_to_c_name_address_lib_prefix" < "$nlist" >> "$output_objdir/$my_dlsyms" ++ ;; ++ esac ++ $ECHO >> "$output_objdir/$my_dlsyms" "\ ++ {0, (void *) 0} ++}; ++ ++/* This works around a problem in FreeBSD linker */ ++#ifdef FREEBSD_WORKAROUND ++static const void *lt_preloaded_setup() { ++ return lt_${my_prefix}_LTX_preloaded_symbols; ++} ++#endif ++ ++#ifdef __cplusplus ++} ++#endif\ ++" ++ } # !$opt_dry_run ++ ++ pic_flag_for_symtable= ++ case "$compile_command " in ++ *" -static "*) ;; ++ *) ++ case $host in ++ # compiling the symbol table file with pic_flag works around ++ # a FreeBSD bug that causes programs to crash when -lm is ++ # linked before any other PIC object. But we must not use ++ # pic_flag when linking with -static. The problem exists in ++ # FreeBSD 2.2.6 and is fixed in FreeBSD 3.1. ++ *-*-freebsd2*|*-*-freebsd3.0*|*-*-freebsdelf3.0*) ++ pic_flag_for_symtable=" $pic_flag -DFREEBSD_WORKAROUND" ;; ++ *-*-hpux*) ++ pic_flag_for_symtable=" $pic_flag" ;; ++ *) ++ if test "X$my_pic_p" != Xno; then ++ pic_flag_for_symtable=" $pic_flag" ++ fi ++ ;; ++ esac ++ ;; ++ esac ++ symtab_cflags= ++ for arg in $LTCFLAGS; do ++ case $arg in ++ -pie | -fpie | -fPIE) ;; ++ *) symtab_cflags="$symtab_cflags $arg" ;; ++ esac ++ done ++ ++ # Now compile the dynamic symbol file. ++ func_show_eval '(cd $output_objdir && $LTCC$symtab_cflags -c$no_builtin_flag$pic_flag_for_symtable "$my_dlsyms")' 'exit $?' ++ ++ # Clean up the generated files. ++ func_show_eval '$RM "$output_objdir/$my_dlsyms" "$nlist" "${nlist}S" "${nlist}T"' ++ ++ # Transform the symbol file into the correct name. ++ symfileobj="$output_objdir/${my_outputname}S.$objext" ++ case $host in ++ *cygwin* | *mingw* | *cegcc* ) ++ if test -f "$output_objdir/$my_outputname.def"; then ++ compile_command=`$ECHO "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"` ++ finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"` ++ else ++ compile_command=`$ECHO "X$compile_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"` ++ finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"` ++ fi ++ ;; ++ *) ++ compile_command=`$ECHO "X$compile_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"` ++ finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"` ++ ;; ++ esac ++ ;; ++ *) ++ func_fatal_error "unknown suffix for \`$my_dlsyms'" ++ ;; ++ esac ++ else ++ # We keep going just in case the user didn't refer to ++ # lt_preloaded_symbols. The linker will fail if global_symbol_pipe ++ # really was required. ++ ++ # Nullify the symbol file. ++ compile_command=`$ECHO "X$compile_command" | $Xsed -e "s% @SYMFILE@%%"` ++ finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s% @SYMFILE@%%"` ++ fi ++} ++ ++# func_win32_libid arg ++# return the library type of file 'arg' ++# ++# Need a lot of goo to handle *both* DLLs and import libs ++# Has to be a shell function in order to 'eat' the argument ++# that is supplied when $file_magic_command is called. ++func_win32_libid () ++{ ++ $opt_debug ++ win32_libid_type="unknown" ++ win32_fileres=`file -L $1 2>/dev/null` ++ case $win32_fileres in ++ *ar\ archive\ import\ library*) # definitely import ++ win32_libid_type="x86 archive import" ++ ;; ++ *ar\ archive*) # could be an import, or static ++ if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null | ++ $EGREP 'file format pe-i386(.*architecture: i386)?' >/dev/null ; then ++ win32_nmres=`eval $NM -f posix -A $1 | ++ $SED -n -e ' ++ 1,100{ ++ / I /{ ++ s,.*,import, ++ p ++ q ++ } ++ }'` ++ case $win32_nmres in ++ import*) win32_libid_type="x86 archive import";; ++ *) win32_libid_type="x86 archive static";; ++ esac ++ fi ++ ;; ++ *DLL*) ++ win32_libid_type="x86 DLL" ++ ;; ++ *executable*) # but shell scripts are "executable" too... ++ case $win32_fileres in ++ *MS\ Windows\ PE\ Intel*) ++ win32_libid_type="x86 DLL" ++ ;; ++ esac ++ ;; ++ esac ++ $ECHO "$win32_libid_type" ++} ++ ++ ++ ++# func_extract_an_archive dir oldlib ++func_extract_an_archive () ++{ ++ $opt_debug ++ f_ex_an_ar_dir="$1"; shift ++ f_ex_an_ar_oldlib="$1" ++ func_show_eval "(cd \$f_ex_an_ar_dir && $AR x \"\$f_ex_an_ar_oldlib\")" 'exit $?' ++ if ($AR t "$f_ex_an_ar_oldlib" | sort | sort -uc >/dev/null 2>&1); then ++ : ++ else ++ func_fatal_error "object name conflicts in archive: $f_ex_an_ar_dir/$f_ex_an_ar_oldlib" ++ fi ++} ++ ++ ++# func_extract_archives gentop oldlib ... ++func_extract_archives () ++{ ++ $opt_debug ++ my_gentop="$1"; shift ++ my_oldlibs=${1+"$@"} ++ my_oldobjs="" ++ my_xlib="" ++ my_xabs="" ++ my_xdir="" ++ ++ for my_xlib in $my_oldlibs; do ++ # Extract the objects. ++ case $my_xlib in ++ [\\/]* | [A-Za-z]:[\\/]*) my_xabs="$my_xlib" ;; ++ *) my_xabs=`pwd`"/$my_xlib" ;; ++ esac ++ func_basename "$my_xlib" ++ my_xlib="$func_basename_result" ++ my_xlib_u=$my_xlib ++ while :; do ++ case " $extracted_archives " in ++ *" $my_xlib_u "*) ++ func_arith $extracted_serial + 1 ++ extracted_serial=$func_arith_result ++ my_xlib_u=lt$extracted_serial-$my_xlib ;; ++ *) break ;; ++ esac ++ done ++ extracted_archives="$extracted_archives $my_xlib_u" ++ my_xdir="$my_gentop/$my_xlib_u" ++ ++ func_mkdir_p "$my_xdir" ++ ++ case $host in ++ *-darwin*) ++ func_verbose "Extracting $my_xabs" ++ # Do not bother doing anything if just a dry run ++ $opt_dry_run || { ++ darwin_orig_dir=`pwd` ++ cd $my_xdir || exit $? ++ darwin_archive=$my_xabs ++ darwin_curdir=`pwd` ++ darwin_base_archive=`basename "$darwin_archive"` ++ darwin_arches=`$LIPO -info "$darwin_archive" 2>/dev/null | $GREP Architectures 2>/dev/null || true` ++ if test -n "$darwin_arches"; then ++ darwin_arches=`$ECHO "$darwin_arches" | $SED -e 's/.*are://'` ++ darwin_arch= ++ func_verbose "$darwin_base_archive has multiple architectures $darwin_arches" ++ for darwin_arch in $darwin_arches ; do ++ func_mkdir_p "unfat-$$/${darwin_base_archive}-${darwin_arch}" ++ $LIPO -thin $darwin_arch -output "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}" "${darwin_archive}" ++ cd "unfat-$$/${darwin_base_archive}-${darwin_arch}" ++ func_extract_an_archive "`pwd`" "${darwin_base_archive}" ++ cd "$darwin_curdir" ++ $RM "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}" ++ done # $darwin_arches ++ ## Okay now we've a bunch of thin objects, gotta fatten them up :) ++ darwin_filelist=`find unfat-$$ -type f -name \*.o -print -o -name \*.lo -print | $SED -e "$basename" | sort -u` ++ darwin_file= ++ darwin_files= ++ for darwin_file in $darwin_filelist; do ++ darwin_files=`find unfat-$$ -name $darwin_file -print | $NL2SP` ++ $LIPO -create -output "$darwin_file" $darwin_files ++ done # $darwin_filelist ++ $RM -rf unfat-$$ ++ cd "$darwin_orig_dir" ++ else ++ cd $darwin_orig_dir ++ func_extract_an_archive "$my_xdir" "$my_xabs" ++ fi # $darwin_arches ++ } # !$opt_dry_run ++ ;; ++ *) ++ func_extract_an_archive "$my_xdir" "$my_xabs" ++ ;; ++ esac ++ my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP` ++ done ++ ++ func_extract_archives_result="$my_oldobjs" ++} ++ ++ ++ ++# func_emit_wrapper_part1 [arg=no] ++# ++# Emit the first part of a libtool wrapper script on stdout. ++# For more information, see the description associated with ++# func_emit_wrapper(), below. ++func_emit_wrapper_part1 () ++{ ++ func_emit_wrapper_part1_arg1=no ++ if test -n "$1" ; then ++ func_emit_wrapper_part1_arg1=$1 ++ fi ++ ++ $ECHO "\ ++#! $SHELL ++ ++# $output - temporary wrapper script for $objdir/$outputname ++# Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION ++# ++# The $output program cannot be directly executed until all the libtool ++# libraries that it depends on are installed. ++# ++# This wrapper script should never be moved out of the build directory. ++# If it is, it will not operate correctly. ++ ++# Sed substitution that helps us do robust quoting. It backslashifies ++# metacharacters that are still active within double-quoted strings. ++Xsed='${SED} -e 1s/^X//' ++sed_quote_subst='$sed_quote_subst' ++ ++# Be Bourne compatible ++if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then ++ emulate sh ++ NULLCMD=: ++ # Zsh 3.x and 4.x performs word splitting on \${1+\"\$@\"}, which ++ # is contrary to our usage. Disable this feature. ++ alias -g '\${1+\"\$@\"}'='\"\$@\"' ++ setopt NO_GLOB_SUBST ++else ++ case \`(set -o) 2>/dev/null\` in *posix*) set -o posix;; esac ++fi ++BIN_SH=xpg4; export BIN_SH # for Tru64 ++DUALCASE=1; export DUALCASE # for MKS sh ++ ++# The HP-UX ksh and POSIX shell print the target directory to stdout ++# if CDPATH is set. ++(unset CDPATH) >/dev/null 2>&1 && unset CDPATH ++ ++relink_command=\"$relink_command\" ++ ++# This environment variable determines our operation mode. ++if test \"\$libtool_install_magic\" = \"$magic\"; then ++ # install mode needs the following variables: ++ generated_by_libtool_version='$macro_version' ++ notinst_deplibs='$notinst_deplibs' ++else ++ # When we are sourced in execute mode, \$file and \$ECHO are already set. ++ if test \"\$libtool_execute_magic\" != \"$magic\"; then ++ ECHO=\"$qecho\" ++ file=\"\$0\" ++ # Make sure echo works. ++ if test \"X\$1\" = X--no-reexec; then ++ # Discard the --no-reexec flag, and continue. ++ shift ++ elif test \"X\`{ \$ECHO '\t'; } 2>/dev/null\`\" = 'X\t'; then ++ # Yippee, \$ECHO works! ++ : ++ else ++ # Restart under the correct shell, and then maybe \$ECHO will work. ++ exec $SHELL \"\$0\" --no-reexec \${1+\"\$@\"} ++ fi ++ fi\ ++" ++ $ECHO "\ ++ ++ # Find the directory that this script lives in. ++ thisdir=\`\$ECHO \"X\$file\" | \$Xsed -e 's%/[^/]*$%%'\` ++ test \"x\$thisdir\" = \"x\$file\" && thisdir=. ++ ++ # Follow symbolic links until we get to the real thisdir. ++ file=\`ls -ld \"\$file\" | ${SED} -n 's/.*-> //p'\` ++ while test -n \"\$file\"; do ++ destdir=\`\$ECHO \"X\$file\" | \$Xsed -e 's%/[^/]*\$%%'\` ++ ++ # If there was a directory component, then change thisdir. ++ if test \"x\$destdir\" != \"x\$file\"; then ++ case \"\$destdir\" in ++ [\\\\/]* | [A-Za-z]:[\\\\/]*) thisdir=\"\$destdir\" ;; ++ *) thisdir=\"\$thisdir/\$destdir\" ;; ++ esac ++ fi ++ ++ file=\`\$ECHO \"X\$file\" | \$Xsed -e 's%^.*/%%'\` ++ file=\`ls -ld \"\$thisdir/\$file\" | ${SED} -n 's/.*-> //p'\` ++ done ++" ++} ++# end: func_emit_wrapper_part1 ++ ++# func_emit_wrapper_part2 [arg=no] ++# ++# Emit the second part of a libtool wrapper script on stdout. ++# For more information, see the description associated with ++# func_emit_wrapper(), below. ++func_emit_wrapper_part2 () ++{ ++ func_emit_wrapper_part2_arg1=no ++ if test -n "$1" ; then ++ func_emit_wrapper_part2_arg1=$1 ++ fi ++ ++ $ECHO "\ ++ ++ # Usually 'no', except on cygwin/mingw when embedded into ++ # the cwrapper. ++ WRAPPER_SCRIPT_BELONGS_IN_OBJDIR=$func_emit_wrapper_part2_arg1 ++ if test \"\$WRAPPER_SCRIPT_BELONGS_IN_OBJDIR\" = \"yes\"; then ++ # special case for '.' ++ if test \"\$thisdir\" = \".\"; then ++ thisdir=\`pwd\` ++ fi ++ # remove .libs from thisdir ++ case \"\$thisdir\" in ++ *[\\\\/]$objdir ) thisdir=\`\$ECHO \"X\$thisdir\" | \$Xsed -e 's%[\\\\/][^\\\\/]*$%%'\` ;; ++ $objdir ) thisdir=. ;; ++ esac ++ fi ++ ++ # Try to get the absolute directory name. ++ absdir=\`cd \"\$thisdir\" && pwd\` ++ test -n \"\$absdir\" && thisdir=\"\$absdir\" ++" ++ ++ if test "$fast_install" = yes; then ++ $ECHO "\ ++ program=lt-'$outputname'$exeext ++ progdir=\"\$thisdir/$objdir\" ++ ++ if test ! -f \"\$progdir/\$program\" || ++ { file=\`ls -1dt \"\$progdir/\$program\" \"\$progdir/../\$program\" 2>/dev/null | ${SED} 1q\`; \\ ++ test \"X\$file\" != \"X\$progdir/\$program\"; }; then ++ ++ file=\"\$\$-\$program\" ++ ++ if test ! -d \"\$progdir\"; then ++ $MKDIR \"\$progdir\" ++ else ++ $RM \"\$progdir/\$file\" ++ fi" ++ ++ $ECHO "\ ++ ++ # relink executable if necessary ++ if test -n \"\$relink_command\"; then ++ if relink_command_output=\`eval \$relink_command 2>&1\`; then : ++ else ++ $ECHO \"\$relink_command_output\" >&2 ++ $RM \"\$progdir/\$file\" ++ exit 1 ++ fi ++ fi ++ ++ $MV \"\$progdir/\$file\" \"\$progdir/\$program\" 2>/dev/null || ++ { $RM \"\$progdir/\$program\"; ++ $MV \"\$progdir/\$file\" \"\$progdir/\$program\"; } ++ $RM \"\$progdir/\$file\" ++ fi" ++ else ++ $ECHO "\ ++ program='$outputname' ++ progdir=\"\$thisdir/$objdir\" ++" ++ fi ++ ++ $ECHO "\ ++ ++ if test -f \"\$progdir/\$program\"; then" ++ ++ # Export our shlibpath_var if we have one. ++ if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then ++ $ECHO "\ ++ # Add our own library path to $shlibpath_var ++ $shlibpath_var=\"$temp_rpath\$$shlibpath_var\" ++ ++ # Some systems cannot cope with colon-terminated $shlibpath_var ++ # The second colon is a workaround for a bug in BeOS R4 sed ++ $shlibpath_var=\`\$ECHO \"X\$$shlibpath_var\" | \$Xsed -e 's/::*\$//'\` ++ ++ export $shlibpath_var ++" ++ fi ++ ++ # fixup the dll searchpath if we need to. ++ if test -n "$dllsearchpath"; then ++ $ECHO "\ ++ # Add the dll search path components to the executable PATH ++ PATH=$dllsearchpath:\$PATH ++" ++ fi ++ ++ $ECHO "\ ++ if test \"\$libtool_execute_magic\" != \"$magic\"; then ++ # Run the actual program with our arguments. ++" ++ case $host in ++ # Backslashes separate directories on plain windows ++ *-*-mingw | *-*-os2* | *-cegcc*) ++ $ECHO "\ ++ exec \"\$progdir\\\\\$program\" \${1+\"\$@\"} ++" ++ ;; ++ ++ *) ++ $ECHO "\ ++ exec \"\$progdir/\$program\" \${1+\"\$@\"} ++" ++ ;; ++ esac ++ $ECHO "\ ++ \$ECHO \"\$0: cannot exec \$program \$*\" 1>&2 ++ exit 1 ++ fi ++ else ++ # The program doesn't exist. ++ \$ECHO \"\$0: error: \\\`\$progdir/\$program' does not exist\" 1>&2 ++ \$ECHO \"This script is just a wrapper for \$program.\" 1>&2 ++ $ECHO \"See the $PACKAGE documentation for more information.\" 1>&2 ++ exit 1 ++ fi ++fi\ ++" ++} ++# end: func_emit_wrapper_part2 ++ ++ ++# func_emit_wrapper [arg=no] ++# ++# Emit a libtool wrapper script on stdout. ++# Don't directly open a file because we may want to ++# incorporate the script contents within a cygwin/mingw ++# wrapper executable. Must ONLY be called from within ++# func_mode_link because it depends on a number of variables ++# set therein. ++# ++# ARG is the value that the WRAPPER_SCRIPT_BELONGS_IN_OBJDIR ++# variable will take. If 'yes', then the emitted script ++# will assume that the directory in which it is stored is ++# the $objdir directory. This is a cygwin/mingw-specific ++# behavior. ++func_emit_wrapper () ++{ ++ func_emit_wrapper_arg1=no ++ if test -n "$1" ; then ++ func_emit_wrapper_arg1=$1 ++ fi ++ ++ # split this up so that func_emit_cwrapperexe_src ++ # can call each part independently. ++ func_emit_wrapper_part1 "${func_emit_wrapper_arg1}" ++ func_emit_wrapper_part2 "${func_emit_wrapper_arg1}" ++} ++ ++ ++# func_to_host_path arg ++# ++# Convert paths to host format when used with build tools. ++# Intended for use with "native" mingw (where libtool itself ++# is running under the msys shell), or in the following cross- ++# build environments: ++# $build $host ++# mingw (msys) mingw [e.g. native] ++# cygwin mingw ++# *nix + wine mingw ++# where wine is equipped with the `winepath' executable. ++# In the native mingw case, the (msys) shell automatically ++# converts paths for any non-msys applications it launches, ++# but that facility isn't available from inside the cwrapper. ++# Similar accommodations are necessary for $host mingw and ++# $build cygwin. Calling this function does no harm for other ++# $host/$build combinations not listed above. ++# ++# ARG is the path (on $build) that should be converted to ++# the proper representation for $host. The result is stored ++# in $func_to_host_path_result. ++func_to_host_path () ++{ ++ func_to_host_path_result="$1" ++ if test -n "$1" ; then ++ case $host in ++ *mingw* ) ++ lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g' ++ case $build in ++ *mingw* ) # actually, msys ++ # awkward: cmd appends spaces to result ++ lt_sed_strip_trailing_spaces="s/[ ]*\$//" ++ func_to_host_path_tmp1=`( cmd //c echo "$1" |\ ++ $SED -e "$lt_sed_strip_trailing_spaces" ) 2>/dev/null || echo ""` ++ func_to_host_path_result=`echo "$func_to_host_path_tmp1" |\ ++ $SED -e "$lt_sed_naive_backslashify"` ++ ;; ++ *cygwin* ) ++ func_to_host_path_tmp1=`cygpath -w "$1"` ++ func_to_host_path_result=`echo "$func_to_host_path_tmp1" |\ ++ $SED -e "$lt_sed_naive_backslashify"` ++ ;; ++ * ) ++ # Unfortunately, winepath does not exit with a non-zero ++ # error code, so we are forced to check the contents of ++ # stdout. On the other hand, if the command is not ++ # found, the shell will set an exit code of 127 and print ++ # *an error message* to stdout. So we must check for both ++ # error code of zero AND non-empty stdout, which explains ++ # the odd construction: ++ func_to_host_path_tmp1=`winepath -w "$1" 2>/dev/null` ++ if test "$?" -eq 0 && test -n "${func_to_host_path_tmp1}"; then ++ func_to_host_path_result=`echo "$func_to_host_path_tmp1" |\ ++ $SED -e "$lt_sed_naive_backslashify"` ++ else ++ # Allow warning below. ++ func_to_host_path_result="" ++ fi ++ ;; ++ esac ++ if test -z "$func_to_host_path_result" ; then ++ func_error "Could not determine host path corresponding to" ++ func_error " '$1'" ++ func_error "Continuing, but uninstalled executables may not work." ++ # Fallback: ++ func_to_host_path_result="$1" ++ fi ++ ;; ++ esac ++ fi ++} ++# end: func_to_host_path ++ ++# func_to_host_pathlist arg ++# ++# Convert pathlists to host format when used with build tools. ++# See func_to_host_path(), above. This function supports the ++# following $build/$host combinations (but does no harm for ++# combinations not listed here): ++# $build $host ++# mingw (msys) mingw [e.g. native] ++# cygwin mingw ++# *nix + wine mingw ++# ++# Path separators are also converted from $build format to ++# $host format. If ARG begins or ends with a path separator ++# character, it is preserved (but converted to $host format) ++# on output. ++# ++# ARG is a pathlist (on $build) that should be converted to ++# the proper representation on $host. The result is stored ++# in $func_to_host_pathlist_result. ++func_to_host_pathlist () ++{ ++ func_to_host_pathlist_result="$1" ++ if test -n "$1" ; then ++ case $host in ++ *mingw* ) ++ lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g' ++ # Remove leading and trailing path separator characters from ++ # ARG. msys behavior is inconsistent here, cygpath turns them ++ # into '.;' and ';.', and winepath ignores them completely. ++ func_to_host_pathlist_tmp2="$1" ++ # Once set for this call, this variable should not be ++ # reassigned. It is used in tha fallback case. ++ func_to_host_pathlist_tmp1=`echo "$func_to_host_pathlist_tmp2" |\ ++ $SED -e 's|^:*||' -e 's|:*$||'` ++ case $build in ++ *mingw* ) # Actually, msys. ++ # Awkward: cmd appends spaces to result. ++ lt_sed_strip_trailing_spaces="s/[ ]*\$//" ++ func_to_host_pathlist_tmp2=`( cmd //c echo "$func_to_host_pathlist_tmp1" |\ ++ $SED -e "$lt_sed_strip_trailing_spaces" ) 2>/dev/null || echo ""` ++ func_to_host_pathlist_result=`echo "$func_to_host_pathlist_tmp2" |\ ++ $SED -e "$lt_sed_naive_backslashify"` ++ ;; ++ *cygwin* ) ++ func_to_host_pathlist_tmp2=`cygpath -w -p "$func_to_host_pathlist_tmp1"` ++ func_to_host_pathlist_result=`echo "$func_to_host_pathlist_tmp2" |\ ++ $SED -e "$lt_sed_naive_backslashify"` ++ ;; ++ * ) ++ # unfortunately, winepath doesn't convert pathlists ++ func_to_host_pathlist_result="" ++ func_to_host_pathlist_oldIFS=$IFS ++ IFS=: ++ for func_to_host_pathlist_f in $func_to_host_pathlist_tmp1 ; do ++ IFS=$func_to_host_pathlist_oldIFS ++ if test -n "$func_to_host_pathlist_f" ; then ++ func_to_host_path "$func_to_host_pathlist_f" ++ if test -n "$func_to_host_path_result" ; then ++ if test -z "$func_to_host_pathlist_result" ; then ++ func_to_host_pathlist_result="$func_to_host_path_result" ++ else ++ func_to_host_pathlist_result="$func_to_host_pathlist_result;$func_to_host_path_result" ++ fi ++ fi ++ fi ++ IFS=: ++ done ++ IFS=$func_to_host_pathlist_oldIFS ++ ;; ++ esac ++ if test -z "$func_to_host_pathlist_result" ; then ++ func_error "Could not determine the host path(s) corresponding to" ++ func_error " '$1'" ++ func_error "Continuing, but uninstalled executables may not work." ++ # Fallback. This may break if $1 contains DOS-style drive ++ # specifications. The fix is not to complicate the expression ++ # below, but for the user to provide a working wine installation ++ # with winepath so that path translation in the cross-to-mingw ++ # case works properly. ++ lt_replace_pathsep_nix_to_dos="s|:|;|g" ++ func_to_host_pathlist_result=`echo "$func_to_host_pathlist_tmp1" |\ ++ $SED -e "$lt_replace_pathsep_nix_to_dos"` ++ fi ++ # Now, add the leading and trailing path separators back ++ case "$1" in ++ :* ) func_to_host_pathlist_result=";$func_to_host_pathlist_result" ++ ;; ++ esac ++ case "$1" in ++ *: ) func_to_host_pathlist_result="$func_to_host_pathlist_result;" ++ ;; ++ esac ++ ;; ++ esac ++ fi ++} ++# end: func_to_host_pathlist ++ ++# func_emit_cwrapperexe_src ++# emit the source code for a wrapper executable on stdout ++# Must ONLY be called from within func_mode_link because ++# it depends on a number of variable set therein. ++func_emit_cwrapperexe_src () ++{ ++ cat <<EOF ++ ++/* $cwrappersource - temporary wrapper executable for $objdir/$outputname ++ Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION ++ ++ The $output program cannot be directly executed until all the libtool ++ libraries that it depends on are installed. ++ ++ This wrapper executable should never be moved out of the build directory. ++ If it is, it will not operate correctly. ++ ++ Currently, it simply execs the wrapper *script* "$SHELL $output", ++ but could eventually absorb all of the scripts functionality and ++ exec $objdir/$outputname directly. ++*/ ++EOF ++ cat <<"EOF" ++#include <stdio.h> ++#include <stdlib.h> ++#ifdef _MSC_VER ++# include <direct.h> ++# include <process.h> ++# include <io.h> ++# define setmode _setmode ++#else ++# include <unistd.h> ++# include <stdint.h> ++# ifdef __CYGWIN__ ++# include <io.h> ++# define HAVE_SETENV ++# ifdef __STRICT_ANSI__ ++char *realpath (const char *, char *); ++int putenv (char *); ++int setenv (const char *, const char *, int); ++# endif ++# endif ++#endif ++#include <malloc.h> ++#include <stdarg.h> ++#include <assert.h> ++#include <string.h> ++#include <ctype.h> ++#include <errno.h> ++#include <fcntl.h> ++#include <sys/stat.h> ++ ++#if defined(PATH_MAX) ++# define LT_PATHMAX PATH_MAX ++#elif defined(MAXPATHLEN) ++# define LT_PATHMAX MAXPATHLEN ++#else ++# define LT_PATHMAX 1024 ++#endif ++ ++#ifndef S_IXOTH ++# define S_IXOTH 0 ++#endif ++#ifndef S_IXGRP ++# define S_IXGRP 0 ++#endif ++ ++#ifdef _MSC_VER ++# define S_IXUSR _S_IEXEC ++# define stat _stat ++# ifndef _INTPTR_T_DEFINED ++# define intptr_t int ++# endif ++#endif ++ ++#ifndef DIR_SEPARATOR ++# define DIR_SEPARATOR '/' ++# define PATH_SEPARATOR ':' ++#endif ++ ++#if defined (_WIN32) || defined (__MSDOS__) || defined (__DJGPP__) || \ ++ defined (__OS2__) ++# define HAVE_DOS_BASED_FILE_SYSTEM ++# define FOPEN_WB "wb" ++# ifndef DIR_SEPARATOR_2 ++# define DIR_SEPARATOR_2 '\\' ++# endif ++# ifndef PATH_SEPARATOR_2 ++# define PATH_SEPARATOR_2 ';' ++# endif ++#endif ++ ++#ifndef DIR_SEPARATOR_2 ++# define IS_DIR_SEPARATOR(ch) ((ch) == DIR_SEPARATOR) ++#else /* DIR_SEPARATOR_2 */ ++# define IS_DIR_SEPARATOR(ch) \ ++ (((ch) == DIR_SEPARATOR) || ((ch) == DIR_SEPARATOR_2)) ++#endif /* DIR_SEPARATOR_2 */ ++ ++#ifndef PATH_SEPARATOR_2 ++# define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR) ++#else /* PATH_SEPARATOR_2 */ ++# define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR_2) ++#endif /* PATH_SEPARATOR_2 */ ++ ++#ifdef __CYGWIN__ ++# define FOPEN_WB "wb" ++#endif ++ ++#ifndef FOPEN_WB ++# define FOPEN_WB "w" ++#endif ++#ifndef _O_BINARY ++# define _O_BINARY 0 ++#endif ++ ++#define XMALLOC(type, num) ((type *) xmalloc ((num) * sizeof(type))) ++#define XFREE(stale) do { \ ++ if (stale) { free ((void *) stale); stale = 0; } \ ++} while (0) ++ ++#undef LTWRAPPER_DEBUGPRINTF ++#if defined DEBUGWRAPPER ++# define LTWRAPPER_DEBUGPRINTF(args) ltwrapper_debugprintf args ++static void ++ltwrapper_debugprintf (const char *fmt, ...) ++{ ++ va_list args; ++ va_start (args, fmt); ++ (void) vfprintf (stderr, fmt, args); ++ va_end (args); ++} ++#else ++# define LTWRAPPER_DEBUGPRINTF(args) ++#endif ++ ++const char *program_name = NULL; ++ ++void *xmalloc (size_t num); ++char *xstrdup (const char *string); ++const char *base_name (const char *name); ++char *find_executable (const char *wrapper); ++char *chase_symlinks (const char *pathspec); ++int make_executable (const char *path); ++int check_executable (const char *path); ++char *strendzap (char *str, const char *pat); ++void lt_fatal (const char *message, ...); ++void lt_setenv (const char *name, const char *value); ++char *lt_extend_str (const char *orig_value, const char *add, int to_end); ++void lt_opt_process_env_set (const char *arg); ++void lt_opt_process_env_prepend (const char *arg); ++void lt_opt_process_env_append (const char *arg); ++int lt_split_name_value (const char *arg, char** name, char** value); ++void lt_update_exe_path (const char *name, const char *value); ++void lt_update_lib_path (const char *name, const char *value); ++ ++static const char *script_text_part1 = ++EOF ++ ++ func_emit_wrapper_part1 yes | ++ $SED -e 's/\([\\"]\)/\\\1/g' \ ++ -e 's/^/ "/' -e 's/$/\\n"/' ++ echo ";" ++ cat <<EOF ++ ++static const char *script_text_part2 = ++EOF ++ func_emit_wrapper_part2 yes | ++ $SED -e 's/\([\\"]\)/\\\1/g' \ ++ -e 's/^/ "/' -e 's/$/\\n"/' ++ echo ";" ++ ++ cat <<EOF ++const char * MAGIC_EXE = "$magic_exe"; ++const char * LIB_PATH_VARNAME = "$shlibpath_var"; ++EOF ++ ++ if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then ++ func_to_host_pathlist "$temp_rpath" ++ cat <<EOF ++const char * LIB_PATH_VALUE = "$func_to_host_pathlist_result"; ++EOF ++ else ++ cat <<"EOF" ++const char * LIB_PATH_VALUE = ""; ++EOF ++ fi ++ ++ if test -n "$dllsearchpath"; then ++ func_to_host_pathlist "$dllsearchpath:" ++ cat <<EOF ++const char * EXE_PATH_VARNAME = "PATH"; ++const char * EXE_PATH_VALUE = "$func_to_host_pathlist_result"; ++EOF ++ else ++ cat <<"EOF" ++const char * EXE_PATH_VARNAME = ""; ++const char * EXE_PATH_VALUE = ""; ++EOF ++ fi ++ ++ if test "$fast_install" = yes; then ++ cat <<EOF ++const char * TARGET_PROGRAM_NAME = "lt-$outputname"; /* hopefully, no .exe */ ++EOF ++ else ++ cat <<EOF ++const char * TARGET_PROGRAM_NAME = "$outputname"; /* hopefully, no .exe */ ++EOF ++ fi ++ ++ ++ cat <<"EOF" ++ ++#define LTWRAPPER_OPTION_PREFIX "--lt-" ++#define LTWRAPPER_OPTION_PREFIX_LENGTH 5 ++ ++static const size_t opt_prefix_len = LTWRAPPER_OPTION_PREFIX_LENGTH; ++static const char *ltwrapper_option_prefix = LTWRAPPER_OPTION_PREFIX; ++ ++static const char *dumpscript_opt = LTWRAPPER_OPTION_PREFIX "dump-script"; ++ ++static const size_t env_set_opt_len = LTWRAPPER_OPTION_PREFIX_LENGTH + 7; ++static const char *env_set_opt = LTWRAPPER_OPTION_PREFIX "env-set"; ++ /* argument is putenv-style "foo=bar", value of foo is set to bar */ ++ ++static const size_t env_prepend_opt_len = LTWRAPPER_OPTION_PREFIX_LENGTH + 11; ++static const char *env_prepend_opt = LTWRAPPER_OPTION_PREFIX "env-prepend"; ++ /* argument is putenv-style "foo=bar", new value of foo is bar${foo} */ ++ ++static const size_t env_append_opt_len = LTWRAPPER_OPTION_PREFIX_LENGTH + 10; ++static const char *env_append_opt = LTWRAPPER_OPTION_PREFIX "env-append"; ++ /* argument is putenv-style "foo=bar", new value of foo is ${foo}bar */ ++ ++int ++main (int argc, char *argv[]) ++{ ++ char **newargz; ++ int newargc; ++ char *tmp_pathspec; ++ char *actual_cwrapper_path; ++ char *actual_cwrapper_name; ++ char *target_name; ++ char *lt_argv_zero; ++ intptr_t rval = 127; ++ ++ int i; ++ ++ program_name = (char *) xstrdup (base_name (argv[0])); ++ LTWRAPPER_DEBUGPRINTF (("(main) argv[0] : %s\n", argv[0])); ++ LTWRAPPER_DEBUGPRINTF (("(main) program_name : %s\n", program_name)); ++ ++ /* very simple arg parsing; don't want to rely on getopt */ ++ for (i = 1; i < argc; i++) ++ { ++ if (strcmp (argv[i], dumpscript_opt) == 0) ++ { ++EOF ++ case "$host" in ++ *mingw* | *cygwin* ) ++ # make stdout use "unix" line endings ++ echo " setmode(1,_O_BINARY);" ++ ;; ++ esac ++ ++ cat <<"EOF" ++ printf ("%s", script_text_part1); ++ printf ("%s", script_text_part2); ++ return 0; ++ } ++ } ++ ++ newargz = XMALLOC (char *, argc + 1); ++ tmp_pathspec = find_executable (argv[0]); ++ if (tmp_pathspec == NULL) ++ lt_fatal ("Couldn't find %s", argv[0]); ++ LTWRAPPER_DEBUGPRINTF (("(main) found exe (before symlink chase) at : %s\n", ++ tmp_pathspec)); ++ ++ actual_cwrapper_path = chase_symlinks (tmp_pathspec); ++ LTWRAPPER_DEBUGPRINTF (("(main) found exe (after symlink chase) at : %s\n", ++ actual_cwrapper_path)); ++ XFREE (tmp_pathspec); ++ ++ actual_cwrapper_name = xstrdup( base_name (actual_cwrapper_path)); ++ strendzap (actual_cwrapper_path, actual_cwrapper_name); ++ ++ /* wrapper name transforms */ ++ strendzap (actual_cwrapper_name, ".exe"); ++ tmp_pathspec = lt_extend_str (actual_cwrapper_name, ".exe", 1); ++ XFREE (actual_cwrapper_name); ++ actual_cwrapper_name = tmp_pathspec; ++ tmp_pathspec = 0; ++ ++ /* target_name transforms -- use actual target program name; might have lt- prefix */ ++ target_name = xstrdup (base_name (TARGET_PROGRAM_NAME)); ++ strendzap (target_name, ".exe"); ++ tmp_pathspec = lt_extend_str (target_name, ".exe", 1); ++ XFREE (target_name); ++ target_name = tmp_pathspec; ++ tmp_pathspec = 0; ++ ++ LTWRAPPER_DEBUGPRINTF (("(main) libtool target name: %s\n", ++ target_name)); ++EOF ++ ++ cat <<EOF ++ newargz[0] = ++ XMALLOC (char, (strlen (actual_cwrapper_path) + ++ strlen ("$objdir") + 1 + strlen (actual_cwrapper_name) + 1)); ++ strcpy (newargz[0], actual_cwrapper_path); ++ strcat (newargz[0], "$objdir"); ++ strcat (newargz[0], "/"); ++EOF ++ ++ cat <<"EOF" ++ /* stop here, and copy so we don't have to do this twice */ ++ tmp_pathspec = xstrdup (newargz[0]); ++ ++ /* do NOT want the lt- prefix here, so use actual_cwrapper_name */ ++ strcat (newargz[0], actual_cwrapper_name); ++ ++ /* DO want the lt- prefix here if it exists, so use target_name */ ++ lt_argv_zero = lt_extend_str (tmp_pathspec, target_name, 1); ++ XFREE (tmp_pathspec); ++ tmp_pathspec = NULL; ++EOF ++ ++ case $host_os in ++ mingw*) ++ cat <<"EOF" ++ { ++ char* p; ++ while ((p = strchr (newargz[0], '\\')) != NULL) ++ { ++ *p = '/'; ++ } ++ while ((p = strchr (lt_argv_zero, '\\')) != NULL) ++ { ++ *p = '/'; ++ } ++ } ++EOF ++ ;; ++ esac ++ ++ cat <<"EOF" ++ XFREE (target_name); ++ XFREE (actual_cwrapper_path); ++ XFREE (actual_cwrapper_name); ++ ++ lt_setenv ("BIN_SH", "xpg4"); /* for Tru64 */ ++ lt_setenv ("DUALCASE", "1"); /* for MSK sh */ ++ lt_update_lib_path (LIB_PATH_VARNAME, LIB_PATH_VALUE); ++ lt_update_exe_path (EXE_PATH_VARNAME, EXE_PATH_VALUE); ++ ++ newargc=0; ++ for (i = 1; i < argc; i++) ++ { ++ if (strncmp (argv[i], env_set_opt, env_set_opt_len) == 0) ++ { ++ if (argv[i][env_set_opt_len] == '=') ++ { ++ const char *p = argv[i] + env_set_opt_len + 1; ++ lt_opt_process_env_set (p); ++ } ++ else if (argv[i][env_set_opt_len] == '\0' && i + 1 < argc) ++ { ++ lt_opt_process_env_set (argv[++i]); /* don't copy */ ++ } ++ else ++ lt_fatal ("%s missing required argument", env_set_opt); ++ continue; ++ } ++ if (strncmp (argv[i], env_prepend_opt, env_prepend_opt_len) == 0) ++ { ++ if (argv[i][env_prepend_opt_len] == '=') ++ { ++ const char *p = argv[i] + env_prepend_opt_len + 1; ++ lt_opt_process_env_prepend (p); ++ } ++ else if (argv[i][env_prepend_opt_len] == '\0' && i + 1 < argc) ++ { ++ lt_opt_process_env_prepend (argv[++i]); /* don't copy */ ++ } ++ else ++ lt_fatal ("%s missing required argument", env_prepend_opt); ++ continue; ++ } ++ if (strncmp (argv[i], env_append_opt, env_append_opt_len) == 0) ++ { ++ if (argv[i][env_append_opt_len] == '=') ++ { ++ const char *p = argv[i] + env_append_opt_len + 1; ++ lt_opt_process_env_append (p); ++ } ++ else if (argv[i][env_append_opt_len] == '\0' && i + 1 < argc) ++ { ++ lt_opt_process_env_append (argv[++i]); /* don't copy */ ++ } ++ else ++ lt_fatal ("%s missing required argument", env_append_opt); ++ continue; ++ } ++ if (strncmp (argv[i], ltwrapper_option_prefix, opt_prefix_len) == 0) ++ { ++ /* however, if there is an option in the LTWRAPPER_OPTION_PREFIX ++ namespace, but it is not one of the ones we know about and ++ have already dealt with, above (inluding dump-script), then ++ report an error. Otherwise, targets might begin to believe ++ they are allowed to use options in the LTWRAPPER_OPTION_PREFIX ++ namespace. The first time any user complains about this, we'll ++ need to make LTWRAPPER_OPTION_PREFIX a configure-time option ++ or a configure.ac-settable value. ++ */ ++ lt_fatal ("Unrecognized option in %s namespace: '%s'", ++ ltwrapper_option_prefix, argv[i]); ++ } ++ /* otherwise ... */ ++ newargz[++newargc] = xstrdup (argv[i]); ++ } ++ newargz[++newargc] = NULL; ++ ++ LTWRAPPER_DEBUGPRINTF (("(main) lt_argv_zero : %s\n", (lt_argv_zero ? lt_argv_zero : "<NULL>"))); ++ for (i = 0; i < newargc; i++) ++ { ++ LTWRAPPER_DEBUGPRINTF (("(main) newargz[%d] : %s\n", i, (newargz[i] ? newargz[i] : "<NULL>"))); ++ } ++ ++EOF ++ ++ case $host_os in ++ mingw*) ++ cat <<"EOF" ++ /* execv doesn't actually work on mingw as expected on unix */ ++ rval = _spawnv (_P_WAIT, lt_argv_zero, (const char * const *) newargz); ++ if (rval == -1) ++ { ++ /* failed to start process */ ++ LTWRAPPER_DEBUGPRINTF (("(main) failed to launch target \"%s\": errno = %d\n", lt_argv_zero, errno)); ++ return 127; ++ } ++ return rval; ++EOF ++ ;; ++ *) ++ cat <<"EOF" ++ execv (lt_argv_zero, newargz); ++ return rval; /* =127, but avoids unused variable warning */ ++EOF ++ ;; ++ esac ++ ++ cat <<"EOF" ++} ++ ++void * ++xmalloc (size_t num) ++{ ++ void *p = (void *) malloc (num); ++ if (!p) ++ lt_fatal ("Memory exhausted"); ++ ++ return p; ++} ++ ++char * ++xstrdup (const char *string) ++{ ++ return string ? strcpy ((char *) xmalloc (strlen (string) + 1), ++ string) : NULL; ++} ++ ++const char * ++base_name (const char *name) ++{ ++ const char *base; ++ ++#if defined (HAVE_DOS_BASED_FILE_SYSTEM) ++ /* Skip over the disk name in MSDOS pathnames. */ ++ if (isalpha ((unsigned char) name[0]) && name[1] == ':') ++ name += 2; ++#endif ++ ++ for (base = name; *name; name++) ++ if (IS_DIR_SEPARATOR (*name)) ++ base = name + 1; ++ return base; ++} ++ ++int ++check_executable (const char *path) ++{ ++ struct stat st; ++ ++ LTWRAPPER_DEBUGPRINTF (("(check_executable) : %s\n", ++ path ? (*path ? path : "EMPTY!") : "NULL!")); ++ if ((!path) || (!*path)) ++ return 0; ++ ++ if ((stat (path, &st) >= 0) ++ && (st.st_mode & (S_IXUSR | S_IXGRP | S_IXOTH))) ++ return 1; ++ else ++ return 0; ++} ++ ++int ++make_executable (const char *path) ++{ ++ int rval = 0; ++ struct stat st; ++ ++ LTWRAPPER_DEBUGPRINTF (("(make_executable) : %s\n", ++ path ? (*path ? path : "EMPTY!") : "NULL!")); ++ if ((!path) || (!*path)) ++ return 0; ++ ++ if (stat (path, &st) >= 0) ++ { ++ rval = chmod (path, st.st_mode | S_IXOTH | S_IXGRP | S_IXUSR); ++ } ++ return rval; ++} ++ ++/* Searches for the full path of the wrapper. Returns ++ newly allocated full path name if found, NULL otherwise ++ Does not chase symlinks, even on platforms that support them. ++*/ ++char * ++find_executable (const char *wrapper) ++{ ++ int has_slash = 0; ++ const char *p; ++ const char *p_next; ++ /* static buffer for getcwd */ ++ char tmp[LT_PATHMAX + 1]; ++ int tmp_len; ++ char *concat_name; ++ ++ LTWRAPPER_DEBUGPRINTF (("(find_executable) : %s\n", ++ wrapper ? (*wrapper ? wrapper : "EMPTY!") : "NULL!")); ++ ++ if ((wrapper == NULL) || (*wrapper == '\0')) ++ return NULL; ++ ++ /* Absolute path? */ ++#if defined (HAVE_DOS_BASED_FILE_SYSTEM) ++ if (isalpha ((unsigned char) wrapper[0]) && wrapper[1] == ':') ++ { ++ concat_name = xstrdup (wrapper); ++ if (check_executable (concat_name)) ++ return concat_name; ++ XFREE (concat_name); ++ } ++ else ++ { ++#endif ++ if (IS_DIR_SEPARATOR (wrapper[0])) ++ { ++ concat_name = xstrdup (wrapper); ++ if (check_executable (concat_name)) ++ return concat_name; ++ XFREE (concat_name); ++ } ++#if defined (HAVE_DOS_BASED_FILE_SYSTEM) ++ } ++#endif ++ ++ for (p = wrapper; *p; p++) ++ if (*p == '/') ++ { ++ has_slash = 1; ++ break; ++ } ++ if (!has_slash) ++ { ++ /* no slashes; search PATH */ ++ const char *path = getenv ("PATH"); ++ if (path != NULL) ++ { ++ for (p = path; *p; p = p_next) ++ { ++ const char *q; ++ size_t p_len; ++ for (q = p; *q; q++) ++ if (IS_PATH_SEPARATOR (*q)) ++ break; ++ p_len = q - p; ++ p_next = (*q == '\0' ? q : q + 1); ++ if (p_len == 0) ++ { ++ /* empty path: current directory */ ++ if (getcwd (tmp, LT_PATHMAX) == NULL) ++ lt_fatal ("getcwd failed"); ++ tmp_len = strlen (tmp); ++ concat_name = ++ XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1); ++ memcpy (concat_name, tmp, tmp_len); ++ concat_name[tmp_len] = '/'; ++ strcpy (concat_name + tmp_len + 1, wrapper); ++ } ++ else ++ { ++ concat_name = ++ XMALLOC (char, p_len + 1 + strlen (wrapper) + 1); ++ memcpy (concat_name, p, p_len); ++ concat_name[p_len] = '/'; ++ strcpy (concat_name + p_len + 1, wrapper); ++ } ++ if (check_executable (concat_name)) ++ return concat_name; ++ XFREE (concat_name); ++ } ++ } ++ /* not found in PATH; assume curdir */ ++ } ++ /* Relative path | not found in path: prepend cwd */ ++ if (getcwd (tmp, LT_PATHMAX) == NULL) ++ lt_fatal ("getcwd failed"); ++ tmp_len = strlen (tmp); ++ concat_name = XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1); ++ memcpy (concat_name, tmp, tmp_len); ++ concat_name[tmp_len] = '/'; ++ strcpy (concat_name + tmp_len + 1, wrapper); ++ ++ if (check_executable (concat_name)) ++ return concat_name; ++ XFREE (concat_name); ++ return NULL; ++} ++ ++char * ++chase_symlinks (const char *pathspec) ++{ ++#ifndef S_ISLNK ++ return xstrdup (pathspec); ++#else ++ char buf[LT_PATHMAX]; ++ struct stat s; ++ char *tmp_pathspec = xstrdup (pathspec); ++ char *p; ++ int has_symlinks = 0; ++ while (strlen (tmp_pathspec) && !has_symlinks) ++ { ++ LTWRAPPER_DEBUGPRINTF (("checking path component for symlinks: %s\n", ++ tmp_pathspec)); ++ if (lstat (tmp_pathspec, &s) == 0) ++ { ++ if (S_ISLNK (s.st_mode) != 0) ++ { ++ has_symlinks = 1; ++ break; ++ } ++ ++ /* search backwards for last DIR_SEPARATOR */ ++ p = tmp_pathspec + strlen (tmp_pathspec) - 1; ++ while ((p > tmp_pathspec) && (!IS_DIR_SEPARATOR (*p))) ++ p--; ++ if ((p == tmp_pathspec) && (!IS_DIR_SEPARATOR (*p))) ++ { ++ /* no more DIR_SEPARATORS left */ ++ break; ++ } ++ *p = '\0'; ++ } ++ else ++ { ++ char *errstr = strerror (errno); ++ lt_fatal ("Error accessing file %s (%s)", tmp_pathspec, errstr); ++ } ++ } ++ XFREE (tmp_pathspec); ++ ++ if (!has_symlinks) ++ { ++ return xstrdup (pathspec); ++ } ++ ++ tmp_pathspec = realpath (pathspec, buf); ++ if (tmp_pathspec == 0) ++ { ++ lt_fatal ("Could not follow symlinks for %s", pathspec); ++ } ++ return xstrdup (tmp_pathspec); ++#endif ++} ++ ++char * ++strendzap (char *str, const char *pat) ++{ ++ size_t len, patlen; ++ ++ assert (str != NULL); ++ assert (pat != NULL); ++ ++ len = strlen (str); ++ patlen = strlen (pat); ++ ++ if (patlen <= len) ++ { ++ str += len - patlen; ++ if (strcmp (str, pat) == 0) ++ *str = '\0'; ++ } ++ return str; ++} ++ ++static void ++lt_error_core (int exit_status, const char *mode, ++ const char *message, va_list ap) ++{ ++ fprintf (stderr, "%s: %s: ", program_name, mode); ++ vfprintf (stderr, message, ap); ++ fprintf (stderr, ".\n"); ++ ++ if (exit_status >= 0) ++ exit (exit_status); ++} ++ ++void ++lt_fatal (const char *message, ...) ++{ ++ va_list ap; ++ va_start (ap, message); ++ lt_error_core (EXIT_FAILURE, "FATAL", message, ap); ++ va_end (ap); ++} ++ ++void ++lt_setenv (const char *name, const char *value) ++{ ++ LTWRAPPER_DEBUGPRINTF (("(lt_setenv) setting '%s' to '%s'\n", ++ (name ? name : "<NULL>"), ++ (value ? value : "<NULL>"))); ++ { ++#ifdef HAVE_SETENV ++ /* always make a copy, for consistency with !HAVE_SETENV */ ++ char *str = xstrdup (value); ++ setenv (name, str, 1); ++#else ++ int len = strlen (name) + 1 + strlen (value) + 1; ++ char *str = XMALLOC (char, len); ++ sprintf (str, "%s=%s", name, value); ++ if (putenv (str) != EXIT_SUCCESS) ++ { ++ XFREE (str); ++ } ++#endif ++ } ++} ++ ++char * ++lt_extend_str (const char *orig_value, const char *add, int to_end) ++{ ++ char *new_value; ++ if (orig_value && *orig_value) ++ { ++ int orig_value_len = strlen (orig_value); ++ int add_len = strlen (add); ++ new_value = XMALLOC (char, add_len + orig_value_len + 1); ++ if (to_end) ++ { ++ strcpy (new_value, orig_value); ++ strcpy (new_value + orig_value_len, add); ++ } ++ else ++ { ++ strcpy (new_value, add); ++ strcpy (new_value + add_len, orig_value); ++ } ++ } ++ else ++ { ++ new_value = xstrdup (add); ++ } ++ return new_value; ++} ++ ++int ++lt_split_name_value (const char *arg, char** name, char** value) ++{ ++ const char *p; ++ int len; ++ if (!arg || !*arg) ++ return 1; ++ ++ p = strchr (arg, (int)'='); ++ ++ if (!p) ++ return 1; ++ ++ *value = xstrdup (++p); ++ ++ len = strlen (arg) - strlen (*value); ++ *name = XMALLOC (char, len); ++ strncpy (*name, arg, len-1); ++ (*name)[len - 1] = '\0'; ++ ++ return 0; ++} ++ ++void ++lt_opt_process_env_set (const char *arg) ++{ ++ char *name = NULL; ++ char *value = NULL; ++ ++ if (lt_split_name_value (arg, &name, &value) != 0) ++ { ++ XFREE (name); ++ XFREE (value); ++ lt_fatal ("bad argument for %s: '%s'", env_set_opt, arg); ++ } ++ ++ lt_setenv (name, value); ++ XFREE (name); ++ XFREE (value); ++} ++ ++void ++lt_opt_process_env_prepend (const char *arg) ++{ ++ char *name = NULL; ++ char *value = NULL; ++ char *new_value = NULL; ++ ++ if (lt_split_name_value (arg, &name, &value) != 0) ++ { ++ XFREE (name); ++ XFREE (value); ++ lt_fatal ("bad argument for %s: '%s'", env_prepend_opt, arg); ++ } ++ ++ new_value = lt_extend_str (getenv (name), value, 0); ++ lt_setenv (name, new_value); ++ XFREE (new_value); ++ XFREE (name); ++ XFREE (value); ++} ++ ++void ++lt_opt_process_env_append (const char *arg) ++{ ++ char *name = NULL; ++ char *value = NULL; ++ char *new_value = NULL; ++ ++ if (lt_split_name_value (arg, &name, &value) != 0) ++ { ++ XFREE (name); ++ XFREE (value); ++ lt_fatal ("bad argument for %s: '%s'", env_append_opt, arg); ++ } ++ ++ new_value = lt_extend_str (getenv (name), value, 1); ++ lt_setenv (name, new_value); ++ XFREE (new_value); ++ XFREE (name); ++ XFREE (value); ++} ++ ++void ++lt_update_exe_path (const char *name, const char *value) ++{ ++ LTWRAPPER_DEBUGPRINTF (("(lt_update_exe_path) modifying '%s' by prepending '%s'\n", ++ (name ? name : "<NULL>"), ++ (value ? value : "<NULL>"))); ++ ++ if (name && *name && value && *value) ++ { ++ char *new_value = lt_extend_str (getenv (name), value, 0); ++ /* some systems can't cope with a ':'-terminated path #' */ ++ int len = strlen (new_value); ++ while (((len = strlen (new_value)) > 0) && IS_PATH_SEPARATOR (new_value[len-1])) ++ { ++ new_value[len-1] = '\0'; ++ } ++ lt_setenv (name, new_value); ++ XFREE (new_value); ++ } ++} ++ ++void ++lt_update_lib_path (const char *name, const char *value) ++{ ++ LTWRAPPER_DEBUGPRINTF (("(lt_update_lib_path) modifying '%s' by prepending '%s'\n", ++ (name ? name : "<NULL>"), ++ (value ? value : "<NULL>"))); ++ ++ if (name && *name && value && *value) ++ { ++ char *new_value = lt_extend_str (getenv (name), value, 0); ++ lt_setenv (name, new_value); ++ XFREE (new_value); ++ } ++} ++ ++ ++EOF ++} ++# end: func_emit_cwrapperexe_src ++ ++# func_mode_link arg... ++func_mode_link () ++{ ++ $opt_debug ++ case $host in ++ *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*) ++ # It is impossible to link a dll without this setting, and ++ # we shouldn't force the makefile maintainer to figure out ++ # which system we are compiling for in order to pass an extra ++ # flag for every libtool invocation. ++ # allow_undefined=no ++ ++ # FIXME: Unfortunately, there are problems with the above when trying ++ # to make a dll which has undefined symbols, in which case not ++ # even a static library is built. For now, we need to specify ++ # -no-undefined on the libtool link line when we can be certain ++ # that all symbols are satisfied, otherwise we get a static library. ++ allow_undefined=yes ++ ;; ++ *) ++ allow_undefined=yes ++ ;; ++ esac ++ libtool_args=$nonopt ++ base_compile="$nonopt $@" ++ compile_command=$nonopt ++ finalize_command=$nonopt ++ ++ compile_rpath= ++ finalize_rpath= ++ compile_shlibpath= ++ finalize_shlibpath= ++ convenience= ++ old_convenience= ++ deplibs= ++ old_deplibs= ++ compiler_flags= ++ linker_flags= ++ dllsearchpath= ++ lib_search_path=`pwd` ++ inst_prefix_dir= ++ new_inherited_linker_flags= ++ ++ avoid_version=no ++ dlfiles= ++ dlprefiles= ++ dlself=no ++ export_dynamic=no ++ export_symbols= ++ export_symbols_regex= ++ generated= ++ libobjs= ++ ltlibs= ++ module=no ++ no_install=no ++ objs= ++ non_pic_objects= ++ precious_files_regex= ++ prefer_static_libs=no ++ preload=no ++ prev= ++ prevarg= ++ release= ++ rpath= ++ xrpath= ++ perm_rpath= ++ temp_rpath= ++ thread_safe=no ++ vinfo= ++ vinfo_number=no ++ weak_libs= ++ single_module="${wl}-single_module" ++ func_infer_tag $base_compile ++ ++ # We need to know -static, to get the right output filenames. ++ for arg ++ do ++ case $arg in ++ -shared) ++ test "$build_libtool_libs" != yes && \ ++ func_fatal_configuration "can not build a shared library" ++ build_old_libs=no ++ break ++ ;; ++ -all-static | -static | -static-libtool-libs) ++ case $arg in ++ -all-static) ++ if test "$build_libtool_libs" = yes && test -z "$link_static_flag"; then ++ func_warning "complete static linking is impossible in this configuration" ++ fi ++ if test -n "$link_static_flag"; then ++ dlopen_self=$dlopen_self_static ++ fi ++ prefer_static_libs=yes ++ ;; ++ -static) ++ if test -z "$pic_flag" && test -n "$link_static_flag"; then ++ dlopen_self=$dlopen_self_static ++ fi ++ prefer_static_libs=built ++ ;; ++ -static-libtool-libs) ++ if test -z "$pic_flag" && test -n "$link_static_flag"; then ++ dlopen_self=$dlopen_self_static ++ fi ++ prefer_static_libs=yes ++ ;; ++ esac ++ build_libtool_libs=no ++ build_old_libs=yes ++ break ++ ;; ++ esac ++ done ++ ++ # See if our shared archives depend on static archives. ++ test -n "$old_archive_from_new_cmds" && build_old_libs=yes ++ ++ # Go through the arguments, transforming them on the way. ++ while test "$#" -gt 0; do ++ arg="$1" ++ shift ++ func_quote_for_eval "$arg" ++ qarg=$func_quote_for_eval_unquoted_result ++ func_append libtool_args " $func_quote_for_eval_result" ++ ++ # If the previous option needs an argument, assign it. ++ if test -n "$prev"; then ++ case $prev in ++ output) ++ func_append compile_command " @OUTPUT@" ++ func_append finalize_command " @OUTPUT@" ++ ;; ++ esac ++ ++ case $prev in ++ dlfiles|dlprefiles) ++ if test "$preload" = no; then ++ # Add the symbol object into the linking commands. ++ func_append compile_command " @SYMFILE@" ++ func_append finalize_command " @SYMFILE@" ++ preload=yes ++ fi ++ case $arg in ++ *.la | *.lo) ;; # We handle these cases below. ++ force) ++ if test "$dlself" = no; then ++ dlself=needless ++ export_dynamic=yes ++ fi ++ prev= ++ continue ++ ;; ++ self) ++ if test "$prev" = dlprefiles; then ++ dlself=yes ++ elif test "$prev" = dlfiles && test "$dlopen_self" != yes; then ++ dlself=yes ++ else ++ dlself=needless ++ export_dynamic=yes ++ fi ++ prev= ++ continue ++ ;; ++ *) ++ if test "$prev" = dlfiles; then ++ dlfiles="$dlfiles $arg" ++ else ++ dlprefiles="$dlprefiles $arg" ++ fi ++ prev= ++ continue ++ ;; ++ esac ++ ;; ++ expsyms) ++ export_symbols="$arg" ++ test -f "$arg" \ ++ || func_fatal_error "symbol file \`$arg' does not exist" ++ prev= ++ continue ++ ;; ++ expsyms_regex) ++ export_symbols_regex="$arg" ++ prev= ++ continue ++ ;; ++ framework) ++ case $host in ++ *-*-darwin*) ++ case "$deplibs " in ++ *" $qarg.ltframework "*) ;; ++ *) deplibs="$deplibs $qarg.ltframework" # this is fixed later ++ ;; ++ esac ++ ;; ++ esac ++ prev= ++ continue ++ ;; ++ inst_prefix) ++ inst_prefix_dir="$arg" ++ prev= ++ continue ++ ;; ++ objectlist) ++ if test -f "$arg"; then ++ save_arg=$arg ++ moreargs= ++ for fil in `cat "$save_arg"` ++ do ++# moreargs="$moreargs $fil" ++ arg=$fil ++ # A libtool-controlled object. ++ ++ # Check to see that this really is a libtool object. ++ if func_lalib_unsafe_p "$arg"; then ++ pic_object= ++ non_pic_object= ++ ++ # Read the .lo file ++ func_source "$arg" ++ ++ if test -z "$pic_object" || ++ test -z "$non_pic_object" || ++ test "$pic_object" = none && ++ test "$non_pic_object" = none; then ++ func_fatal_error "cannot find name of object for \`$arg'" ++ fi ++ ++ # Extract subdirectory from the argument. ++ func_dirname "$arg" "/" "" ++ xdir="$func_dirname_result" ++ ++ if test "$pic_object" != none; then ++ # Prepend the subdirectory the object is found in. ++ pic_object="$xdir$pic_object" ++ ++ if test "$prev" = dlfiles; then ++ if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then ++ dlfiles="$dlfiles $pic_object" ++ prev= ++ continue ++ else ++ # If libtool objects are unsupported, then we need to preload. ++ prev=dlprefiles ++ fi ++ fi ++ ++ # CHECK ME: I think I busted this. -Ossama ++ if test "$prev" = dlprefiles; then ++ # Preload the old-style object. ++ dlprefiles="$dlprefiles $pic_object" ++ prev= ++ fi ++ ++ # A PIC object. ++ func_append libobjs " $pic_object" ++ arg="$pic_object" ++ fi ++ ++ # Non-PIC object. ++ if test "$non_pic_object" != none; then ++ # Prepend the subdirectory the object is found in. ++ non_pic_object="$xdir$non_pic_object" ++ ++ # A standard non-PIC object ++ func_append non_pic_objects " $non_pic_object" ++ if test -z "$pic_object" || test "$pic_object" = none ; then ++ arg="$non_pic_object" ++ fi ++ else ++ # If the PIC object exists, use it instead. ++ # $xdir was prepended to $pic_object above. ++ non_pic_object="$pic_object" ++ func_append non_pic_objects " $non_pic_object" ++ fi ++ else ++ # Only an error if not doing a dry-run. ++ if $opt_dry_run; then ++ # Extract subdirectory from the argument. ++ func_dirname "$arg" "/" "" ++ xdir="$func_dirname_result" ++ ++ func_lo2o "$arg" ++ pic_object=$xdir$objdir/$func_lo2o_result ++ non_pic_object=$xdir$func_lo2o_result ++ func_append libobjs " $pic_object" ++ func_append non_pic_objects " $non_pic_object" ++ else ++ func_fatal_error "\`$arg' is not a valid libtool object" ++ fi ++ fi ++ done ++ else ++ func_fatal_error "link input file \`$arg' does not exist" ++ fi ++ arg=$save_arg ++ prev= ++ continue ++ ;; ++ precious_regex) ++ precious_files_regex="$arg" ++ prev= ++ continue ++ ;; ++ release) ++ release="-$arg" ++ prev= ++ continue ++ ;; ++ rpath | xrpath) ++ # We need an absolute path. ++ case $arg in ++ [\\/]* | [A-Za-z]:[\\/]*) ;; ++ *) ++ func_fatal_error "only absolute run-paths are allowed" ++ ;; ++ esac ++ if test "$prev" = rpath; then ++ case "$rpath " in ++ *" $arg "*) ;; ++ *) rpath="$rpath $arg" ;; ++ esac ++ else ++ case "$xrpath " in ++ *" $arg "*) ;; ++ *) xrpath="$xrpath $arg" ;; ++ esac ++ fi ++ prev= ++ continue ++ ;; ++ shrext) ++ shrext_cmds="$arg" ++ prev= ++ continue ++ ;; ++ weak) ++ weak_libs="$weak_libs $arg" ++ prev= ++ continue ++ ;; ++ xcclinker) ++ linker_flags="$linker_flags $qarg" ++ compiler_flags="$compiler_flags $qarg" ++ prev= ++ func_append compile_command " $qarg" ++ func_append finalize_command " $qarg" ++ continue ++ ;; ++ xcompiler) ++ compiler_flags="$compiler_flags $qarg" ++ prev= ++ func_append compile_command " $qarg" ++ func_append finalize_command " $qarg" ++ continue ++ ;; ++ xlinker) ++ linker_flags="$linker_flags $qarg" ++ compiler_flags="$compiler_flags $wl$qarg" ++ prev= ++ func_append compile_command " $wl$qarg" ++ func_append finalize_command " $wl$qarg" ++ continue ++ ;; ++ *) ++ eval "$prev=\"\$arg\"" ++ prev= ++ continue ++ ;; ++ esac ++ fi # test -n "$prev" ++ ++ prevarg="$arg" ++ ++ case $arg in ++ -all-static) ++ if test -n "$link_static_flag"; then ++ # See comment for -static flag below, for more details. ++ func_append compile_command " $link_static_flag" ++ func_append finalize_command " $link_static_flag" ++ fi ++ continue ++ ;; ++ ++ -allow-undefined) ++ # FIXME: remove this flag sometime in the future. ++ func_fatal_error "\`-allow-undefined' must not be used because it is the default" ++ ;; ++ ++ -avoid-version) ++ avoid_version=yes ++ continue ++ ;; ++ ++ -dlopen) ++ prev=dlfiles ++ continue ++ ;; ++ ++ -dlpreopen) ++ prev=dlprefiles ++ continue ++ ;; ++ ++ -export-dynamic) ++ export_dynamic=yes ++ continue ++ ;; ++ ++ -export-symbols | -export-symbols-regex) ++ if test -n "$export_symbols" || test -n "$export_symbols_regex"; then ++ func_fatal_error "more than one -exported-symbols argument is not allowed" ++ fi ++ if test "X$arg" = "X-export-symbols"; then ++ prev=expsyms ++ else ++ prev=expsyms_regex ++ fi ++ continue ++ ;; ++ ++ -framework) ++ prev=framework ++ continue ++ ;; ++ ++ -inst-prefix-dir) ++ prev=inst_prefix ++ continue ++ ;; ++ ++ # The native IRIX linker understands -LANG:*, -LIST:* and -LNO:* ++ # so, if we see these flags be careful not to treat them like -L ++ -L[A-Z][A-Z]*:*) ++ case $with_gcc/$host in ++ no/*-*-irix* | /*-*-irix*) ++ func_append compile_command " $arg" ++ func_append finalize_command " $arg" ++ ;; ++ esac ++ continue ++ ;; ++ ++ -L*) ++ func_stripname '-L' '' "$arg" ++ dir=$func_stripname_result ++ if test -z "$dir"; then ++ if test "$#" -gt 0; then ++ func_fatal_error "require no space between \`-L' and \`$1'" ++ else ++ func_fatal_error "need path for \`-L' option" ++ fi ++ fi ++ # We need an absolute path. ++ case $dir in ++ [\\/]* | [A-Za-z]:[\\/]*) ;; ++ *) ++ absdir=`cd "$dir" && pwd` ++ test -z "$absdir" && \ ++ func_fatal_error "cannot determine absolute directory name of \`$dir'" ++ dir="$absdir" ++ ;; ++ esac ++ case "$deplibs " in ++ *" -L$dir "*) ;; ++ *) ++ deplibs="$deplibs -L$dir" ++ lib_search_path="$lib_search_path $dir" ++ ;; ++ esac ++ case $host in ++ *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*) ++ testbindir=`$ECHO "X$dir" | $Xsed -e 's*/lib$*/bin*'` ++ case :$dllsearchpath: in ++ *":$dir:"*) ;; ++ ::) dllsearchpath=$dir;; ++ *) dllsearchpath="$dllsearchpath:$dir";; ++ esac ++ case :$dllsearchpath: in ++ *":$testbindir:"*) ;; ++ ::) dllsearchpath=$testbindir;; ++ *) dllsearchpath="$dllsearchpath:$testbindir";; ++ esac ++ ;; ++ esac ++ continue ++ ;; ++ ++ -l*) ++ if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then ++ case $host in ++ *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos* | *-cegcc*) ++ # These systems don't actually have a C or math library (as such) ++ continue ++ ;; ++ *-*-os2*) ++ # These systems don't actually have a C library (as such) ++ test "X$arg" = "X-lc" && continue ++ ;; ++ *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*) ++ # Do not include libc due to us having libc/libc_r. ++ test "X$arg" = "X-lc" && continue ++ ;; ++ *-*-rhapsody* | *-*-darwin1.[012]) ++ # Rhapsody C and math libraries are in the System framework ++ deplibs="$deplibs System.ltframework" ++ continue ++ ;; ++ *-*-sco3.2v5* | *-*-sco5v6*) ++ # Causes problems with __ctype ++ test "X$arg" = "X-lc" && continue ++ ;; ++ *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*) ++ # Compiler inserts libc in the correct place for threads to work ++ test "X$arg" = "X-lc" && continue ++ ;; ++ esac ++ elif test "X$arg" = "X-lc_r"; then ++ case $host in ++ *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*) ++ # Do not include libc_r directly, use -pthread flag. ++ continue ++ ;; ++ esac ++ fi ++ deplibs="$deplibs $arg" ++ continue ++ ;; ++ ++ -module) ++ module=yes ++ continue ++ ;; ++ ++ # Tru64 UNIX uses -model [arg] to determine the layout of C++ ++ # classes, name mangling, and exception handling. ++ # Darwin uses the -arch flag to determine output architecture. ++ -model|-arch|-isysroot) ++ compiler_flags="$compiler_flags $arg" ++ func_append compile_command " $arg" ++ func_append finalize_command " $arg" ++ prev=xcompiler ++ continue ++ ;; ++ ++ -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads) ++ compiler_flags="$compiler_flags $arg" ++ func_append compile_command " $arg" ++ func_append finalize_command " $arg" ++ case "$new_inherited_linker_flags " in ++ *" $arg "*) ;; ++ * ) new_inherited_linker_flags="$new_inherited_linker_flags $arg" ;; ++ esac ++ continue ++ ;; ++ ++ -multi_module) ++ single_module="${wl}-multi_module" ++ continue ++ ;; ++ ++ -no-fast-install) ++ fast_install=no ++ continue ++ ;; ++ ++ -no-install) ++ case $host in ++ *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-darwin* | *-cegcc*) ++ # The PATH hackery in wrapper scripts is required on Windows ++ # and Darwin in order for the loader to find any dlls it needs. ++ func_warning "\`-no-install' is ignored for $host" ++ func_warning "assuming \`-no-fast-install' instead" ++ fast_install=no ++ ;; ++ *) no_install=yes ;; ++ esac ++ continue ++ ;; ++ ++ -no-undefined) ++ allow_undefined=no ++ continue ++ ;; ++ ++ -objectlist) ++ prev=objectlist ++ continue ++ ;; ++ ++ -o) prev=output ;; ++ ++ -precious-files-regex) ++ prev=precious_regex ++ continue ++ ;; ++ ++ -release) ++ prev=release ++ continue ++ ;; ++ ++ -rpath) ++ prev=rpath ++ continue ++ ;; ++ ++ -R) ++ prev=xrpath ++ continue ++ ;; ++ ++ -R*) ++ func_stripname '-R' '' "$arg" ++ dir=$func_stripname_result ++ # We need an absolute path. ++ case $dir in ++ [\\/]* | [A-Za-z]:[\\/]*) ;; ++ *) ++ func_fatal_error "only absolute run-paths are allowed" ++ ;; ++ esac ++ case "$xrpath " in ++ *" $dir "*) ;; ++ *) xrpath="$xrpath $dir" ;; ++ esac ++ continue ++ ;; ++ ++ -shared) ++ # The effects of -shared are defined in a previous loop. ++ continue ++ ;; ++ ++ -shrext) ++ prev=shrext ++ continue ++ ;; ++ ++ -static | -static-libtool-libs) ++ # The effects of -static are defined in a previous loop. ++ # We used to do the same as -all-static on platforms that ++ # didn't have a PIC flag, but the assumption that the effects ++ # would be equivalent was wrong. It would break on at least ++ # Digital Unix and AIX. ++ continue ++ ;; ++ ++ -thread-safe) ++ thread_safe=yes ++ continue ++ ;; ++ ++ -version-info) ++ prev=vinfo ++ continue ++ ;; ++ ++ -version-number) ++ prev=vinfo ++ vinfo_number=yes ++ continue ++ ;; ++ ++ -weak) ++ prev=weak ++ continue ++ ;; ++ ++ -Wc,*) ++ func_stripname '-Wc,' '' "$arg" ++ args=$func_stripname_result ++ arg= ++ save_ifs="$IFS"; IFS=',' ++ for flag in $args; do ++ IFS="$save_ifs" ++ func_quote_for_eval "$flag" ++ arg="$arg $wl$func_quote_for_eval_result" ++ compiler_flags="$compiler_flags $func_quote_for_eval_result" ++ done ++ IFS="$save_ifs" ++ func_stripname ' ' '' "$arg" ++ arg=$func_stripname_result ++ ;; ++ ++ -Wl,*) ++ func_stripname '-Wl,' '' "$arg" ++ args=$func_stripname_result ++ arg= ++ save_ifs="$IFS"; IFS=',' ++ for flag in $args; do ++ IFS="$save_ifs" ++ func_quote_for_eval "$flag" ++ arg="$arg $wl$func_quote_for_eval_result" ++ compiler_flags="$compiler_flags $wl$func_quote_for_eval_result" ++ linker_flags="$linker_flags $func_quote_for_eval_result" ++ done ++ IFS="$save_ifs" ++ func_stripname ' ' '' "$arg" ++ arg=$func_stripname_result ++ ;; ++ ++ -Xcompiler) ++ prev=xcompiler ++ continue ++ ;; ++ ++ -Xlinker) ++ prev=xlinker ++ continue ++ ;; ++ ++ -XCClinker) ++ prev=xcclinker ++ continue ++ ;; ++ ++ # -msg_* for osf cc ++ -msg_*) ++ func_quote_for_eval "$arg" ++ arg="$func_quote_for_eval_result" ++ ;; ++ ++ # -64, -mips[0-9] enable 64-bit mode on the SGI compiler ++ # -r[0-9][0-9]* specifies the processor on the SGI compiler ++ # -xarch=*, -xtarget=* enable 64-bit mode on the Sun compiler ++ # +DA*, +DD* enable 64-bit mode on the HP compiler ++ # -q* pass through compiler args for the IBM compiler ++ # -m*, -t[45]*, -txscale* pass through architecture-specific ++ # compiler args for GCC ++ # -F/path gives path to uninstalled frameworks, gcc on darwin ++ # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC ++ # @file GCC response files ++ -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \ ++ -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-fstack-protector*|-flto) ++ func_quote_for_eval "$arg" ++ arg="$func_quote_for_eval_result" ++ func_append compile_command " $arg" ++ func_append finalize_command " $arg" ++ compiler_flags="$compiler_flags $arg" ++ continue ++ ;; ++ ++ # Some other compiler flag. ++ -* | +*) ++ func_quote_for_eval "$arg" ++ arg="$func_quote_for_eval_result" ++ ;; ++ ++ *.$objext) ++ # A standard object. ++ objs="$objs $arg" ++ ;; ++ ++ *.lo) ++ # A libtool-controlled object. ++ ++ # Check to see that this really is a libtool object. ++ if func_lalib_unsafe_p "$arg"; then ++ pic_object= ++ non_pic_object= ++ ++ # Read the .lo file ++ func_source "$arg" ++ ++ if test -z "$pic_object" || ++ test -z "$non_pic_object" || ++ test "$pic_object" = none && ++ test "$non_pic_object" = none; then ++ func_fatal_error "cannot find name of object for \`$arg'" ++ fi ++ ++ # Extract subdirectory from the argument. ++ func_dirname "$arg" "/" "" ++ xdir="$func_dirname_result" ++ ++ if test "$pic_object" != none; then ++ # Prepend the subdirectory the object is found in. ++ pic_object="$xdir$pic_object" ++ ++ if test "$prev" = dlfiles; then ++ if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then ++ dlfiles="$dlfiles $pic_object" ++ prev= ++ continue ++ else ++ # If libtool objects are unsupported, then we need to preload. ++ prev=dlprefiles ++ fi ++ fi ++ ++ # CHECK ME: I think I busted this. -Ossama ++ if test "$prev" = dlprefiles; then ++ # Preload the old-style object. ++ dlprefiles="$dlprefiles $pic_object" ++ prev= ++ fi ++ ++ # A PIC object. ++ func_append libobjs " $pic_object" ++ arg="$pic_object" ++ fi ++ ++ # Non-PIC object. ++ if test "$non_pic_object" != none; then ++ # Prepend the subdirectory the object is found in. ++ non_pic_object="$xdir$non_pic_object" ++ ++ # A standard non-PIC object ++ func_append non_pic_objects " $non_pic_object" ++ if test -z "$pic_object" || test "$pic_object" = none ; then ++ arg="$non_pic_object" ++ fi ++ else ++ # If the PIC object exists, use it instead. ++ # $xdir was prepended to $pic_object above. ++ non_pic_object="$pic_object" ++ func_append non_pic_objects " $non_pic_object" ++ fi ++ else ++ # Only an error if not doing a dry-run. ++ if $opt_dry_run; then ++ # Extract subdirectory from the argument. ++ func_dirname "$arg" "/" "" ++ xdir="$func_dirname_result" ++ ++ func_lo2o "$arg" ++ pic_object=$xdir$objdir/$func_lo2o_result ++ non_pic_object=$xdir$func_lo2o_result ++ func_append libobjs " $pic_object" ++ func_append non_pic_objects " $non_pic_object" ++ else ++ func_fatal_error "\`$arg' is not a valid libtool object" ++ fi ++ fi ++ ;; ++ ++ *.$libext) ++ # An archive. ++ deplibs="$deplibs $arg" ++ old_deplibs="$old_deplibs $arg" ++ continue ++ ;; ++ ++ *.la) ++ # A libtool-controlled library. ++ ++ if test "$prev" = dlfiles; then ++ # This library was specified with -dlopen. ++ dlfiles="$dlfiles $arg" ++ prev= ++ elif test "$prev" = dlprefiles; then ++ # The library was specified with -dlpreopen. ++ dlprefiles="$dlprefiles $arg" ++ prev= ++ else ++ deplibs="$deplibs $arg" ++ fi ++ continue ++ ;; ++ ++ # Some other compiler argument. ++ *) ++ # Unknown arguments in both finalize_command and compile_command need ++ # to be aesthetically quoted because they are evaled later. ++ func_quote_for_eval "$arg" ++ arg="$func_quote_for_eval_result" ++ ;; ++ esac # arg ++ ++ # Now actually substitute the argument into the commands. ++ if test -n "$arg"; then ++ func_append compile_command " $arg" ++ func_append finalize_command " $arg" ++ fi ++ done # argument parsing loop ++ ++ test -n "$prev" && \ ++ func_fatal_help "the \`$prevarg' option requires an argument" ++ ++ if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then ++ eval arg=\"$export_dynamic_flag_spec\" ++ func_append compile_command " $arg" ++ func_append finalize_command " $arg" ++ fi ++ ++ oldlibs= ++ # calculate the name of the file, without its directory ++ func_basename "$output" ++ outputname="$func_basename_result" ++ libobjs_save="$libobjs" ++ ++ if test -n "$shlibpath_var"; then ++ # get the directories listed in $shlibpath_var ++ eval shlib_search_path=\`\$ECHO \"X\${$shlibpath_var}\" \| \$Xsed -e \'s/:/ /g\'\` ++ else ++ shlib_search_path= ++ fi ++ eval sys_lib_search_path=\"$sys_lib_search_path_spec\" ++ eval sys_lib_dlsearch_path=\"$sys_lib_dlsearch_path_spec\" ++ ++ func_dirname "$output" "/" "" ++ output_objdir="$func_dirname_result$objdir" ++ # Create the object directory. ++ func_mkdir_p "$output_objdir" ++ ++ # Determine the type of output ++ case $output in ++ "") ++ func_fatal_help "you must specify an output file" ++ ;; ++ *.$libext) linkmode=oldlib ;; ++ *.lo | *.$objext) linkmode=obj ;; ++ *.la) linkmode=lib ;; ++ *) linkmode=prog ;; # Anything else should be a program. ++ esac ++ ++ specialdeplibs= ++ ++ libs= ++ # Find all interdependent deplibs by searching for libraries ++ # that are linked more than once (e.g. -la -lb -la) ++ for deplib in $deplibs; do ++ if $opt_duplicate_deps ; then ++ case "$libs " in ++ *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; ++ esac ++ fi ++ libs="$libs $deplib" ++ done ++ ++ if test "$linkmode" = lib; then ++ libs="$predeps $libs $compiler_lib_search_path $postdeps" ++ ++ # Compute libraries that are listed more than once in $predeps ++ # $postdeps and mark them as special (i.e., whose duplicates are ++ # not to be eliminated). ++ pre_post_deps= ++ if $opt_duplicate_compiler_generated_deps; then ++ for pre_post_dep in $predeps $postdeps; do ++ case "$pre_post_deps " in ++ *" $pre_post_dep "*) specialdeplibs="$specialdeplibs $pre_post_deps" ;; ++ esac ++ pre_post_deps="$pre_post_deps $pre_post_dep" ++ done ++ fi ++ pre_post_deps= ++ fi ++ ++ deplibs= ++ newdependency_libs= ++ newlib_search_path= ++ need_relink=no # whether we're linking any uninstalled libtool libraries ++ notinst_deplibs= # not-installed libtool libraries ++ notinst_path= # paths that contain not-installed libtool libraries ++ ++ case $linkmode in ++ lib) ++ passes="conv dlpreopen link" ++ for file in $dlfiles $dlprefiles; do ++ case $file in ++ *.la) ;; ++ *) ++ func_fatal_help "libraries can \`-dlopen' only libtool libraries: $file" ++ ;; ++ esac ++ done ++ ;; ++ prog) ++ compile_deplibs= ++ finalize_deplibs= ++ alldeplibs=no ++ newdlfiles= ++ newdlprefiles= ++ passes="conv scan dlopen dlpreopen link" ++ ;; ++ *) passes="conv" ++ ;; ++ esac ++ ++ for pass in $passes; do ++ # The preopen pass in lib mode reverses $deplibs; put it back here ++ # so that -L comes before libs that need it for instance... ++ if test "$linkmode,$pass" = "lib,link"; then ++ ## FIXME: Find the place where the list is rebuilt in the wrong ++ ## order, and fix it there properly ++ tmp_deplibs= ++ for deplib in $deplibs; do ++ tmp_deplibs="$deplib $tmp_deplibs" ++ done ++ deplibs="$tmp_deplibs" ++ fi ++ ++ if test "$linkmode,$pass" = "lib,link" || ++ test "$linkmode,$pass" = "prog,scan"; then ++ libs="$deplibs" ++ deplibs= ++ fi ++ if test "$linkmode" = prog; then ++ case $pass in ++ dlopen) libs="$dlfiles" ;; ++ dlpreopen) libs="$dlprefiles" ;; ++ link) ++ libs="$deplibs %DEPLIBS%" ++ test "X$link_all_deplibs" != Xno && libs="$libs $dependency_libs" ++ ;; ++ esac ++ fi ++ if test "$linkmode,$pass" = "lib,dlpreopen"; then ++ # Collect and forward deplibs of preopened libtool libs ++ for lib in $dlprefiles; do ++ # Ignore non-libtool-libs ++ dependency_libs= ++ case $lib in ++ *.la) func_source "$lib" ;; ++ esac ++ ++ # Collect preopened libtool deplibs, except any this library ++ # has declared as weak libs ++ for deplib in $dependency_libs; do ++ deplib_base=`$ECHO "X$deplib" | $Xsed -e "$basename"` ++ case " $weak_libs " in ++ *" $deplib_base "*) ;; ++ *) deplibs="$deplibs $deplib" ;; ++ esac ++ done ++ done ++ libs="$dlprefiles" ++ fi ++ if test "$pass" = dlopen; then ++ # Collect dlpreopened libraries ++ save_deplibs="$deplibs" ++ deplibs= ++ fi ++ ++ for deplib in $libs; do ++ lib= ++ found=no ++ case $deplib in ++ -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads) ++ if test "$linkmode,$pass" = "prog,link"; then ++ compile_deplibs="$deplib $compile_deplibs" ++ finalize_deplibs="$deplib $finalize_deplibs" ++ else ++ compiler_flags="$compiler_flags $deplib" ++ if test "$linkmode" = lib ; then ++ case "$new_inherited_linker_flags " in ++ *" $deplib "*) ;; ++ * ) new_inherited_linker_flags="$new_inherited_linker_flags $deplib" ;; ++ esac ++ fi ++ fi ++ continue ++ ;; ++ -l*) ++ if test "$linkmode" != lib && test "$linkmode" != prog; then ++ func_warning "\`-l' is ignored for archives/objects" ++ continue ++ fi ++ func_stripname '-l' '' "$deplib" ++ name=$func_stripname_result ++ if test "$linkmode" = lib; then ++ searchdirs="$newlib_search_path $lib_search_path $compiler_lib_search_dirs $sys_lib_search_path $shlib_search_path" ++ else ++ searchdirs="$newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path" ++ fi ++ for searchdir in $searchdirs; do ++ for search_ext in .la $std_shrext .so .a; do ++ # Search the libtool library ++ lib="$searchdir/lib${name}${search_ext}" ++ if test -f "$lib"; then ++ if test "$search_ext" = ".la"; then ++ found=yes ++ else ++ found=no ++ fi ++ break 2 ++ fi ++ done ++ done ++ if test "$found" != yes; then ++ # deplib doesn't seem to be a libtool library ++ if test "$linkmode,$pass" = "prog,link"; then ++ compile_deplibs="$deplib $compile_deplibs" ++ finalize_deplibs="$deplib $finalize_deplibs" ++ else ++ deplibs="$deplib $deplibs" ++ test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs" ++ fi ++ continue ++ else # deplib is a libtool library ++ # If $allow_libtool_libs_with_static_runtimes && $deplib is a stdlib, ++ # We need to do some special things here, and not later. ++ if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then ++ case " $predeps $postdeps " in ++ *" $deplib "*) ++ if func_lalib_p "$lib"; then ++ library_names= ++ old_library= ++ func_source "$lib" ++ for l in $old_library $library_names; do ++ ll="$l" ++ done ++ if test "X$ll" = "X$old_library" ; then # only static version available ++ found=no ++ func_dirname "$lib" "" "." ++ ladir="$func_dirname_result" ++ lib=$ladir/$old_library ++ if test "$linkmode,$pass" = "prog,link"; then ++ compile_deplibs="$deplib $compile_deplibs" ++ finalize_deplibs="$deplib $finalize_deplibs" ++ else ++ deplibs="$deplib $deplibs" ++ test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs" ++ fi ++ continue ++ fi ++ fi ++ ;; ++ *) ;; ++ esac ++ fi ++ fi ++ ;; # -l ++ *.ltframework) ++ if test "$linkmode,$pass" = "prog,link"; then ++ compile_deplibs="$deplib $compile_deplibs" ++ finalize_deplibs="$deplib $finalize_deplibs" ++ else ++ deplibs="$deplib $deplibs" ++ if test "$linkmode" = lib ; then ++ case "$new_inherited_linker_flags " in ++ *" $deplib "*) ;; ++ * ) new_inherited_linker_flags="$new_inherited_linker_flags $deplib" ;; ++ esac ++ fi ++ fi ++ continue ++ ;; ++ -L*) ++ case $linkmode in ++ lib) ++ deplibs="$deplib $deplibs" ++ test "$pass" = conv && continue ++ newdependency_libs="$deplib $newdependency_libs" ++ func_stripname '-L' '' "$deplib" ++ newlib_search_path="$newlib_search_path $func_stripname_result" ++ ;; ++ prog) ++ if test "$pass" = conv; then ++ deplibs="$deplib $deplibs" ++ continue ++ fi ++ if test "$pass" = scan; then ++ deplibs="$deplib $deplibs" ++ else ++ compile_deplibs="$deplib $compile_deplibs" ++ finalize_deplibs="$deplib $finalize_deplibs" ++ fi ++ func_stripname '-L' '' "$deplib" ++ newlib_search_path="$newlib_search_path $func_stripname_result" ++ ;; ++ *) ++ func_warning "\`-L' is ignored for archives/objects" ++ ;; ++ esac # linkmode ++ continue ++ ;; # -L ++ -R*) ++ if test "$pass" = link; then ++ func_stripname '-R' '' "$deplib" ++ dir=$func_stripname_result ++ # Make sure the xrpath contains only unique directories. ++ case "$xrpath " in ++ *" $dir "*) ;; ++ *) xrpath="$xrpath $dir" ;; ++ esac ++ fi ++ deplibs="$deplib $deplibs" ++ continue ++ ;; ++ *.la) lib="$deplib" ;; ++ *.$libext) ++ if test "$pass" = conv; then ++ deplibs="$deplib $deplibs" ++ continue ++ fi ++ case $linkmode in ++ lib) ++ # Linking convenience modules into shared libraries is allowed, ++ # but linking other static libraries is non-portable. ++ case " $dlpreconveniencelibs " in ++ *" $deplib "*) ;; ++ *) ++ valid_a_lib=no ++ case $deplibs_check_method in ++ match_pattern*) ++ set dummy $deplibs_check_method; shift ++ match_pattern_regex=`expr "$deplibs_check_method" : "$1 \(.*\)"` ++ if eval "\$ECHO \"X$deplib\"" 2>/dev/null | $Xsed -e 10q \ ++ | $EGREP "$match_pattern_regex" > /dev/null; then ++ valid_a_lib=yes ++ fi ++ ;; ++ pass_all) ++ valid_a_lib=yes ++ ;; ++ esac ++ if test "$valid_a_lib" != yes; then ++ $ECHO ++ $ECHO "*** Warning: Trying to link with static lib archive $deplib." ++ $ECHO "*** I have the capability to make that library automatically link in when" ++ $ECHO "*** you link to this library. But I can only do this if you have a" ++ $ECHO "*** shared version of the library, which you do not appear to have" ++ $ECHO "*** because the file extensions .$libext of this argument makes me believe" ++ $ECHO "*** that it is just a static archive that I should not use here." ++ else ++ $ECHO ++ $ECHO "*** Warning: Linking the shared library $output against the" ++ $ECHO "*** static library $deplib is not portable!" ++ deplibs="$deplib $deplibs" ++ fi ++ ;; ++ esac ++ continue ++ ;; ++ prog) ++ if test "$pass" != link; then ++ deplibs="$deplib $deplibs" ++ else ++ compile_deplibs="$deplib $compile_deplibs" ++ finalize_deplibs="$deplib $finalize_deplibs" ++ fi ++ continue ++ ;; ++ esac # linkmode ++ ;; # *.$libext ++ *.lo | *.$objext) ++ if test "$pass" = conv; then ++ deplibs="$deplib $deplibs" ++ elif test "$linkmode" = prog; then ++ if test "$pass" = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then ++ # If there is no dlopen support or we're linking statically, ++ # we need to preload. ++ newdlprefiles="$newdlprefiles $deplib" ++ compile_deplibs="$deplib $compile_deplibs" ++ finalize_deplibs="$deplib $finalize_deplibs" ++ else ++ newdlfiles="$newdlfiles $deplib" ++ fi ++ fi ++ continue ++ ;; ++ %DEPLIBS%) ++ alldeplibs=yes ++ continue ++ ;; ++ esac # case $deplib ++ ++ if test "$found" = yes || test -f "$lib"; then : ++ else ++ func_fatal_error "cannot find the library \`$lib' or unhandled argument \`$deplib'" ++ fi ++ ++ # Check to see that this really is a libtool archive. ++ func_lalib_unsafe_p "$lib" \ ++ || func_fatal_error "\`$lib' is not a valid libtool archive" ++ ++ func_dirname "$lib" "" "." ++ ladir="$func_dirname_result" ++ ++ dlname= ++ dlopen= ++ dlpreopen= ++ libdir= ++ library_names= ++ old_library= ++ inherited_linker_flags= ++ # If the library was installed with an old release of libtool, ++ # it will not redefine variables installed, or shouldnotlink ++ installed=yes ++ shouldnotlink=no ++ avoidtemprpath= ++ ++ ++ # Read the .la file ++ func_source "$lib" ++ ++ # Convert "-framework foo" to "foo.ltframework" ++ if test -n "$inherited_linker_flags"; then ++ tmp_inherited_linker_flags=`$ECHO "X$inherited_linker_flags" | $Xsed -e 's/-framework \([^ $]*\)/\1.ltframework/g'` ++ for tmp_inherited_linker_flag in $tmp_inherited_linker_flags; do ++ case " $new_inherited_linker_flags " in ++ *" $tmp_inherited_linker_flag "*) ;; ++ *) new_inherited_linker_flags="$new_inherited_linker_flags $tmp_inherited_linker_flag";; ++ esac ++ done ++ fi ++ dependency_libs=`$ECHO "X $dependency_libs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'` ++ if test "$linkmode,$pass" = "lib,link" || ++ test "$linkmode,$pass" = "prog,scan" || ++ { test "$linkmode" != prog && test "$linkmode" != lib; }; then ++ test -n "$dlopen" && dlfiles="$dlfiles $dlopen" ++ test -n "$dlpreopen" && dlprefiles="$dlprefiles $dlpreopen" ++ fi ++ ++ if test "$pass" = conv; then ++ # Only check for convenience libraries ++ deplibs="$lib $deplibs" ++ if test -z "$libdir"; then ++ if test -z "$old_library"; then ++ func_fatal_error "cannot find name of link library for \`$lib'" ++ fi ++ # It is a libtool convenience library, so add in its objects. ++ convenience="$convenience $ladir/$objdir/$old_library" ++ old_convenience="$old_convenience $ladir/$objdir/$old_library" ++ tmp_libs= ++ for deplib in $dependency_libs; do ++ deplibs="$deplib $deplibs" ++ if $opt_duplicate_deps ; then ++ case "$tmp_libs " in ++ *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; ++ esac ++ fi ++ tmp_libs="$tmp_libs $deplib" ++ done ++ elif test "$linkmode" != prog && test "$linkmode" != lib; then ++ func_fatal_error "\`$lib' is not a convenience library" ++ fi ++ continue ++ fi # $pass = conv ++ ++ ++ # Get the name of the library we link against. ++ linklib= ++ for l in $old_library $library_names; do ++ linklib="$l" ++ done ++ if test -z "$linklib"; then ++ func_fatal_error "cannot find name of link library for \`$lib'" ++ fi ++ ++ # This library was specified with -dlopen. ++ if test "$pass" = dlopen; then ++ if test -z "$libdir"; then ++ func_fatal_error "cannot -dlopen a convenience library: \`$lib'" ++ fi ++ if test -z "$dlname" || ++ test "$dlopen_support" != yes || ++ test "$build_libtool_libs" = no; then ++ # If there is no dlname, no dlopen support or we're linking ++ # statically, we need to preload. We also need to preload any ++ # dependent libraries so libltdl's deplib preloader doesn't ++ # bomb out in the load deplibs phase. ++ dlprefiles="$dlprefiles $lib $dependency_libs" ++ else ++ newdlfiles="$newdlfiles $lib" ++ fi ++ continue ++ fi # $pass = dlopen ++ ++ # We need an absolute path. ++ case $ladir in ++ [\\/]* | [A-Za-z]:[\\/]*) abs_ladir="$ladir" ;; ++ *) ++ abs_ladir=`cd "$ladir" && pwd` ++ if test -z "$abs_ladir"; then ++ func_warning "cannot determine absolute directory name of \`$ladir'" ++ func_warning "passing it literally to the linker, although it might fail" ++ abs_ladir="$ladir" ++ fi ++ ;; ++ esac ++ func_basename "$lib" ++ laname="$func_basename_result" ++ ++ # Find the relevant object directory and library name. ++ if test "X$installed" = Xyes; then ++ if test ! -f "$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then ++ func_warning "library \`$lib' was moved." ++ dir="$ladir" ++ absdir="$abs_ladir" ++ libdir="$abs_ladir" ++ else ++ dir="$libdir" ++ absdir="$libdir" ++ fi ++ test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes ++ else ++ if test ! -f "$ladir/$objdir/$linklib" && test -f "$abs_ladir/$linklib"; then ++ dir="$ladir" ++ absdir="$abs_ladir" ++ # Remove this search path later ++ notinst_path="$notinst_path $abs_ladir" ++ else ++ dir="$ladir/$objdir" ++ absdir="$abs_ladir/$objdir" ++ # Remove this search path later ++ notinst_path="$notinst_path $abs_ladir" ++ fi ++ fi # $installed = yes ++ func_stripname 'lib' '.la' "$laname" ++ name=$func_stripname_result ++ ++ # This library was specified with -dlpreopen. ++ if test "$pass" = dlpreopen; then ++ if test -z "$libdir" && test "$linkmode" = prog; then ++ func_fatal_error "only libraries may -dlpreopen a convenience library: \`$lib'" ++ fi ++ # Prefer using a static library (so that no silly _DYNAMIC symbols ++ # are required to link). ++ if test -n "$old_library"; then ++ newdlprefiles="$newdlprefiles $dir/$old_library" ++ # Keep a list of preopened convenience libraries to check ++ # that they are being used correctly in the link pass. ++ test -z "$libdir" && \ ++ dlpreconveniencelibs="$dlpreconveniencelibs $dir/$old_library" ++ # Otherwise, use the dlname, so that lt_dlopen finds it. ++ elif test -n "$dlname"; then ++ newdlprefiles="$newdlprefiles $dir/$dlname" ++ else ++ newdlprefiles="$newdlprefiles $dir/$linklib" ++ fi ++ fi # $pass = dlpreopen ++ ++ if test -z "$libdir"; then ++ # Link the convenience library ++ if test "$linkmode" = lib; then ++ deplibs="$dir/$old_library $deplibs" ++ elif test "$linkmode,$pass" = "prog,link"; then ++ compile_deplibs="$dir/$old_library $compile_deplibs" ++ finalize_deplibs="$dir/$old_library $finalize_deplibs" ++ else ++ deplibs="$lib $deplibs" # used for prog,scan pass ++ fi ++ continue ++ fi ++ ++ ++ if test "$linkmode" = prog && test "$pass" != link; then ++ newlib_search_path="$newlib_search_path $ladir" ++ deplibs="$lib $deplibs" ++ ++ linkalldeplibs=no ++ if test "$link_all_deplibs" != no || test -z "$library_names" || ++ test "$build_libtool_libs" = no; then ++ linkalldeplibs=yes ++ fi ++ ++ tmp_libs= ++ for deplib in $dependency_libs; do ++ case $deplib in ++ -L*) func_stripname '-L' '' "$deplib" ++ newlib_search_path="$newlib_search_path $func_stripname_result" ++ ;; ++ esac ++ # Need to link against all dependency_libs? ++ if test "$linkalldeplibs" = yes; then ++ deplibs="$deplib $deplibs" ++ else ++ # Need to hardcode shared library paths ++ # or/and link against static libraries ++ newdependency_libs="$deplib $newdependency_libs" ++ fi ++ if $opt_duplicate_deps ; then ++ case "$tmp_libs " in ++ *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; ++ esac ++ fi ++ tmp_libs="$tmp_libs $deplib" ++ done # for deplib ++ continue ++ fi # $linkmode = prog... ++ ++ if test "$linkmode,$pass" = "prog,link"; then ++ if test -n "$library_names" && ++ { { test "$prefer_static_libs" = no || ++ test "$prefer_static_libs,$installed" = "built,yes"; } || ++ test -z "$old_library"; }; then ++ # We need to hardcode the library path ++ if test -n "$shlibpath_var" && test -z "$avoidtemprpath" ; then ++ # Make sure the rpath contains only unique directories. ++ case "$temp_rpath:" in ++ *"$absdir:"*) ;; ++ *) temp_rpath="$temp_rpath$absdir:" ;; ++ 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 && ++ { test "$deplibs_check_method" = pass_all || ++ { test "$build_libtool_libs" = yes && ++ test -n "$library_names"; }; }; then ++ # We only need to search for static libraries ++ continue ++ fi ++ fi ++ ++ link_static=no # Whether the deplib will be linked statically ++ use_static_libs=$prefer_static_libs ++ if test "$use_static_libs" = built && test "$installed" = yes; then ++ use_static_libs=no ++ fi ++ if test -n "$library_names" && ++ { test "$use_static_libs" = no || test -z "$old_library"; }; then ++ case $host in ++ *cygwin* | *mingw* | *cegcc*) ++ # No point in relinking DLLs because paths are not encoded ++ notinst_deplibs="$notinst_deplibs $lib" ++ need_relink=no ++ ;; ++ *) ++ if test "$installed" = no; then ++ notinst_deplibs="$notinst_deplibs $lib" ++ need_relink=yes ++ fi ++ ;; ++ esac ++ # This is a shared library ++ ++ # Warn about portability, can't link against -module's on some ++ # systems (darwin). Don't bleat about dlopened modules though! ++ dlopenmodule="" ++ for dlpremoduletest in $dlprefiles; do ++ if test "X$dlpremoduletest" = "X$lib"; then ++ dlopenmodule="$dlpremoduletest" ++ break ++ fi ++ done ++ if test -z "$dlopenmodule" && test "$shouldnotlink" = yes && test "$pass" = link; then ++ $ECHO ++ if test "$linkmode" = prog; then ++ $ECHO "*** Warning: Linking the executable $output against the loadable module" ++ else ++ $ECHO "*** Warning: Linking the shared library $output against the loadable module" ++ fi ++ $ECHO "*** $linklib is not portable!" ++ fi ++ if test "$linkmode" = lib && ++ test "$hardcode_into_libs" = yes; then ++ # 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 ++ ++ if test -n "$old_archive_from_expsyms_cmds"; then ++ # figure out the soname ++ set dummy $library_names ++ shift ++ realname="$1" ++ shift ++ libname=`eval "\\$ECHO \"$libname_spec\""` ++ # use dlname if we got it. it's perfectly good, no? ++ if test -n "$dlname"; then ++ soname="$dlname" ++ elif test -n "$soname_spec"; then ++ # bleh windows ++ case $host in ++ *cygwin* | mingw* | *cegcc*) ++ func_arith $current - $age ++ major=$func_arith_result ++ versuffix="-$major" ++ ;; ++ esac ++ eval soname=\"$soname_spec\" ++ else ++ soname="$realname" ++ fi ++ ++ # Make a new name for the extract_expsyms_cmds to use ++ soroot="$soname" ++ func_basename "$soroot" ++ soname="$func_basename_result" ++ func_stripname 'lib' '.dll' "$soname" ++ newlib=libimp-$func_stripname_result.a ++ ++ # If the library has no export list, then create one now ++ if test -f "$output_objdir/$soname-def"; then : ++ else ++ func_verbose "extracting exported symbol list from \`$soname'" ++ func_execute_cmds "$extract_expsyms_cmds" 'exit $?' ++ fi ++ ++ # Create $newlib ++ if test -f "$output_objdir/$newlib"; then :; else ++ func_verbose "generating import library for \`$soname'" ++ func_execute_cmds "$old_archive_from_expsyms_cmds" 'exit $?' ++ fi ++ # make sure the library variables are pointing to the new library ++ dir=$output_objdir ++ linklib=$newlib ++ fi # test -n "$old_archive_from_expsyms_cmds" ++ ++ if test "$linkmode" = prog || test "$mode" != relink; then ++ add_shlibpath= ++ add_dir= ++ add= ++ lib_linked=yes ++ case $hardcode_action in ++ immediate | unsupported) ++ if test "$hardcode_direct" = no; then ++ add="$dir/$linklib" ++ case $host in ++ *-*-sco3.2v5.0.[024]*) add_dir="-L$dir" ;; ++ *-*-sysv4*uw2*) add_dir="-L$dir" ;; ++ *-*-sysv5OpenUNIX* | *-*-sysv5UnixWare7.[01].[10]* | \ ++ *-*-unixware7*) add_dir="-L$dir" ;; ++ *-*-darwin* ) ++ # if the lib is a (non-dlopened) module then we can not ++ # link against it, someone is ignoring the earlier warnings ++ if /usr/bin/file -L $add 2> /dev/null | ++ $GREP ": [^:]* bundle" >/dev/null ; then ++ if test "X$dlopenmodule" != "X$lib"; then ++ $ECHO "*** Warning: lib $linklib is a module, not a shared library" ++ if test -z "$old_library" ; then ++ $ECHO ++ $ECHO "*** And there doesn't seem to be a static archive available" ++ $ECHO "*** The link will probably fail, sorry" ++ else ++ add="$dir/$old_library" ++ fi ++ elif test -n "$old_library"; then ++ add="$dir/$old_library" ++ fi ++ fi ++ esac ++ elif test "$hardcode_minus_L" = no; then ++ case $host in ++ *-*-sunos*) add_shlibpath="$dir" ;; ++ esac ++ add_dir="-L$dir" ++ add="-l$name" ++ elif test "$hardcode_shlibpath_var" = no; then ++ add_shlibpath="$dir" ++ add="-l$name" ++ else ++ lib_linked=no ++ fi ++ ;; ++ relink) ++ if test "$hardcode_direct" = yes && ++ test "$hardcode_direct_absolute" = no; then ++ add="$dir/$linklib" ++ elif test "$hardcode_minus_L" = yes; then ++ add_dir="-L$dir" ++ # Try looking first in the location we're being installed to. ++ if test -n "$inst_prefix_dir"; then ++ case $libdir in ++ [\\/]*) ++ add_dir="$add_dir -L$inst_prefix_dir$libdir" ++ ;; ++ esac ++ fi ++ add="-l$name" ++ elif test "$hardcode_shlibpath_var" = yes; then ++ add_shlibpath="$dir" ++ add="-l$name" ++ else ++ lib_linked=no ++ fi ++ ;; ++ *) lib_linked=no ;; ++ esac ++ ++ if test "$lib_linked" != yes; then ++ func_fatal_configuration "unsupported hardcode properties" ++ fi ++ ++ if test -n "$add_shlibpath"; then ++ case :$compile_shlibpath: in ++ *":$add_shlibpath:"*) ;; ++ *) compile_shlibpath="$compile_shlibpath$add_shlibpath:" ;; ++ esac ++ fi ++ if test "$linkmode" = prog; then ++ test -n "$add_dir" && compile_deplibs="$add_dir $compile_deplibs" ++ test -n "$add" && compile_deplibs="$add $compile_deplibs" ++ else ++ test -n "$add_dir" && deplibs="$add_dir $deplibs" ++ test -n "$add" && deplibs="$add $deplibs" ++ if test "$hardcode_direct" != yes && ++ test "$hardcode_minus_L" != yes && ++ test "$hardcode_shlibpath_var" = yes; then ++ case :$finalize_shlibpath: in ++ *":$libdir:"*) ;; ++ *) finalize_shlibpath="$finalize_shlibpath$libdir:" ;; ++ esac ++ fi ++ fi ++ fi ++ ++ if test "$linkmode" = prog || test "$mode" = relink; then ++ add_shlibpath= ++ add_dir= ++ add= ++ # Finalize command for both is simple: just hardcode it. ++ if test "$hardcode_direct" = yes && ++ test "$hardcode_direct_absolute" = no; then ++ add="$libdir/$linklib" ++ elif test "$hardcode_minus_L" = yes; then ++ add_dir="-L$libdir" ++ add="-l$name" ++ elif test "$hardcode_shlibpath_var" = yes; then ++ case :$finalize_shlibpath: in ++ *":$libdir:"*) ;; ++ *) finalize_shlibpath="$finalize_shlibpath$libdir:" ;; ++ esac ++ add="-l$name" ++ elif test "$hardcode_automatic" = yes; then ++ if test -n "$inst_prefix_dir" && ++ test -f "$inst_prefix_dir$libdir/$linklib" ; then ++ add="$inst_prefix_dir$libdir/$linklib" ++ else ++ add="$libdir/$linklib" ++ fi ++ else ++ # We cannot seem to hardcode it, guess we'll fake it. ++ add_dir="-L$libdir" ++ # Try looking first in the location we're being installed to. ++ if test -n "$inst_prefix_dir"; then ++ case $libdir in ++ [\\/]*) ++ add_dir="$add_dir -L$inst_prefix_dir$libdir" ++ ;; ++ esac ++ fi ++ add="-l$name" ++ fi ++ ++ if test "$linkmode" = prog; then ++ test -n "$add_dir" && finalize_deplibs="$add_dir $finalize_deplibs" ++ test -n "$add" && finalize_deplibs="$add $finalize_deplibs" ++ else ++ test -n "$add_dir" && deplibs="$add_dir $deplibs" ++ test -n "$add" && deplibs="$add $deplibs" ++ fi ++ fi ++ elif test "$linkmode" = prog; then ++ # Here we assume that one of hardcode_direct or hardcode_minus_L ++ # is not unsupported. This is valid on all known static and ++ # shared platforms. ++ if test "$hardcode_direct" != unsupported; then ++ test -n "$old_library" && linklib="$old_library" ++ compile_deplibs="$dir/$linklib $compile_deplibs" ++ finalize_deplibs="$dir/$linklib $finalize_deplibs" ++ else ++ compile_deplibs="-l$name -L$dir $compile_deplibs" ++ finalize_deplibs="-l$name -L$dir $finalize_deplibs" ++ fi ++ elif test "$build_libtool_libs" = yes; then ++ # Not a shared library ++ if test "$deplibs_check_method" != pass_all; then ++ # We're trying link a shared library against a static one ++ # but the system doesn't support it. ++ ++ # Just print a warning and add the library to dependency_libs so ++ # that the program can be linked against the static library. ++ $ECHO ++ $ECHO "*** Warning: This system can not link to static lib archive $lib." ++ $ECHO "*** I have the capability to make that library automatically link in when" ++ $ECHO "*** you link to this library. But I can only do this if you have a" ++ $ECHO "*** shared version of the library, which you do not appear to have." ++ if test "$module" = yes; then ++ $ECHO "*** But as you try to build a module library, libtool will still create " ++ $ECHO "*** a static module, that should work as long as the dlopening application" ++ $ECHO "*** is linked with the -dlopen flag to resolve symbols at runtime." ++ if test -z "$global_symbol_pipe"; then ++ $ECHO ++ $ECHO "*** However, this would only work if libtool was able to extract symbol" ++ $ECHO "*** lists from a program, using \`nm' or equivalent, but libtool could" ++ $ECHO "*** not find such a program. So, this module is probably useless." ++ $ECHO "*** \`nm' from GNU binutils and a full rebuild may help." ++ fi ++ if test "$build_old_libs" = no; then ++ build_libtool_libs=module ++ build_old_libs=yes ++ else ++ build_libtool_libs=no ++ fi ++ fi ++ else ++ deplibs="$dir/$old_library $deplibs" ++ link_static=yes ++ fi ++ fi # link shared/static library? ++ ++ if test "$linkmode" = lib; then ++ if test -n "$dependency_libs" && ++ { test "$hardcode_into_libs" != yes || ++ test "$build_old_libs" = yes || ++ test "$link_static" = yes; }; then ++ # Extract -R from dependency_libs ++ temp_deplibs= ++ for libdir in $dependency_libs; do ++ case $libdir in ++ -R*) func_stripname '-R' '' "$libdir" ++ temp_xrpath=$func_stripname_result ++ case " $xrpath " in ++ *" $temp_xrpath "*) ;; ++ *) xrpath="$xrpath $temp_xrpath";; ++ esac;; ++ *) temp_deplibs="$temp_deplibs $libdir";; ++ esac ++ done ++ dependency_libs="$temp_deplibs" ++ fi ++ ++ newlib_search_path="$newlib_search_path $absdir" ++ # Link against this library ++ test "$link_static" = no && newdependency_libs="$abs_ladir/$laname $newdependency_libs" ++ # ... and its dependency_libs ++ tmp_libs= ++ for deplib in $dependency_libs; do ++ newdependency_libs="$deplib $newdependency_libs" ++ if $opt_duplicate_deps ; then ++ case "$tmp_libs " in ++ *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; ++ esac ++ fi ++ tmp_libs="$tmp_libs $deplib" ++ done ++ ++ if test "$link_all_deplibs" != no; then ++ # Add the search paths of all dependency libraries ++ for deplib in $dependency_libs; do ++ path= ++ case $deplib in ++ -L*) path="$deplib" ;; ++ *.la) ++ func_dirname "$deplib" "" "." ++ dir="$func_dirname_result" ++ # We need an absolute path. ++ case $dir in ++ [\\/]* | [A-Za-z]:[\\/]*) absdir="$dir" ;; ++ *) ++ absdir=`cd "$dir" && pwd` ++ if test -z "$absdir"; then ++ func_warning "cannot determine absolute directory name of \`$dir'" ++ absdir="$dir" ++ fi ++ ;; ++ esac ++ if $GREP "^installed=no" $deplib > /dev/null; then ++ case $host in ++ *-*-darwin*) ++ depdepl= ++ eval deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib` ++ if test -n "$deplibrary_names" ; then ++ for tmp in $deplibrary_names ; do ++ depdepl=$tmp ++ done ++ if test -f "$absdir/$objdir/$depdepl" ; then ++ depdepl="$absdir/$objdir/$depdepl" ++ darwin_install_name=`${OTOOL} -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'` ++ if test -z "$darwin_install_name"; then ++ darwin_install_name=`${OTOOL64} -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'` ++ fi ++ compiler_flags="$compiler_flags ${wl}-dylib_file ${wl}${darwin_install_name}:${depdepl}" ++ linker_flags="$linker_flags -dylib_file ${darwin_install_name}:${depdepl}" ++ path= ++ fi ++ fi ++ ;; ++ *) ++ path="-L$absdir/$objdir" ++ ;; ++ esac ++ else ++ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` ++ test -z "$libdir" && \ ++ func_fatal_error "\`$deplib' is not a valid libtool archive" ++ test "$absdir" != "$libdir" && \ ++ func_warning "\`$deplib' seems to be moved" ++ ++ path="-L$absdir" ++ fi ++ ;; ++ esac ++ case " $deplibs " in ++ *" $path "*) ;; ++ *) deplibs="$path $deplibs" ;; ++ esac ++ done ++ fi # link_all_deplibs != no ++ fi # linkmode = lib ++ done # for deplib in $libs ++ if test "$pass" = link; then ++ if test "$linkmode" = "prog"; then ++ compile_deplibs="$new_inherited_linker_flags $compile_deplibs" ++ finalize_deplibs="$new_inherited_linker_flags $finalize_deplibs" ++ else ++ compiler_flags="$compiler_flags "`$ECHO "X $new_inherited_linker_flags" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'` ++ fi ++ fi ++ dependency_libs="$newdependency_libs" ++ if test "$pass" = dlpreopen; then ++ # Link the dlpreopened libraries before other libraries ++ for deplib in $save_deplibs; do ++ deplibs="$deplib $deplibs" ++ done ++ fi ++ if test "$pass" != dlopen; then ++ if test "$pass" != conv; then ++ # Make sure lib_search_path contains only unique directories. ++ lib_search_path= ++ for dir in $newlib_search_path; do ++ case "$lib_search_path " in ++ *" $dir "*) ;; ++ *) lib_search_path="$lib_search_path $dir" ;; ++ esac ++ done ++ newlib_search_path= ++ fi ++ ++ if test "$linkmode,$pass" != "prog,link"; then ++ vars="deplibs" ++ else ++ vars="compile_deplibs finalize_deplibs" ++ fi ++ for var in $vars dependency_libs; do ++ # Add libraries to $var in reverse order ++ eval tmp_libs=\"\$$var\" ++ new_libs= ++ for deplib in $tmp_libs; do ++ # FIXME: Pedantically, this is the right thing to do, so ++ # that some nasty dependency loop isn't accidentally ++ # broken: ++ #new_libs="$deplib $new_libs" ++ # Pragmatically, this seems to cause very few problems in ++ # practice: ++ case $deplib in ++ -L*) new_libs="$deplib $new_libs" ;; ++ -R*) ;; ++ *) ++ # And here is the reason: when a library appears more ++ # than once as an explicit dependence of a library, or ++ # is implicitly linked in more than once by the ++ # compiler, it is considered special, and multiple ++ # occurrences thereof are not removed. Compare this ++ # with having the same library being listed as a ++ # dependency of multiple other libraries: in this case, ++ # we know (pedantically, we assume) the library does not ++ # need to be listed more than once, so we keep only the ++ # last copy. This is not always right, but it is rare ++ # enough that we require users that really mean to play ++ # such unportable linking tricks to link the library ++ # using -Wl,-lname, so that libtool does not consider it ++ # for duplicate removal. ++ case " $specialdeplibs " in ++ *" $deplib "*) new_libs="$deplib $new_libs" ;; ++ *) ++ case " $new_libs " in ++ *" $deplib "*) ;; ++ *) new_libs="$deplib $new_libs" ;; ++ esac ++ ;; ++ esac ++ ;; ++ esac ++ done ++ tmp_libs= ++ for deplib in $new_libs; do ++ case $deplib in ++ -L*) ++ case " $tmp_libs " in ++ *" $deplib "*) ;; ++ *) tmp_libs="$tmp_libs $deplib" ;; ++ esac ++ ;; ++ *) tmp_libs="$tmp_libs $deplib" ;; ++ esac ++ done ++ eval $var=\"$tmp_libs\" ++ done # for var ++ fi ++ # Last step: remove runtime libs from dependency_libs ++ # (they stay in deplibs) ++ tmp_libs= ++ for i in $dependency_libs ; do ++ case " $predeps $postdeps $compiler_lib_search_path " in ++ *" $i "*) ++ i="" ++ ;; ++ esac ++ if test -n "$i" ; then ++ tmp_libs="$tmp_libs $i" ++ fi ++ done ++ dependency_libs=$tmp_libs ++ done # for pass ++ if test "$linkmode" = prog; then ++ dlfiles="$newdlfiles" ++ fi ++ if test "$linkmode" = prog || test "$linkmode" = lib; then ++ dlprefiles="$newdlprefiles" ++ fi ++ ++ case $linkmode in ++ oldlib) ++ if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then ++ func_warning "\`-dlopen' is ignored for archives" ++ fi ++ ++ case " $deplibs" in ++ *\ -l* | *\ -L*) ++ func_warning "\`-l' and \`-L' are ignored for archives" ;; ++ esac ++ ++ test -n "$rpath" && \ ++ func_warning "\`-rpath' is ignored for archives" ++ ++ test -n "$xrpath" && \ ++ func_warning "\`-R' is ignored for archives" ++ ++ test -n "$vinfo" && \ ++ func_warning "\`-version-info/-version-number' is ignored for archives" ++ ++ test -n "$release" && \ ++ func_warning "\`-release' is ignored for archives" ++ ++ test -n "$export_symbols$export_symbols_regex" && \ ++ func_warning "\`-export-symbols' is ignored for archives" ++ ++ # Now set the variables for building old libraries. ++ build_libtool_libs=no ++ oldlibs="$output" ++ objs="$objs$old_deplibs" ++ ;; ++ ++ lib) ++ # Make sure we only generate libraries of the form `libNAME.la'. ++ case $outputname in ++ lib*) ++ func_stripname 'lib' '.la' "$outputname" ++ name=$func_stripname_result ++ eval shared_ext=\"$shrext_cmds\" ++ eval libname=\"$libname_spec\" ++ ;; ++ *) ++ test "$module" = no && \ ++ func_fatal_help "libtool library \`$output' must begin with \`lib'" ++ ++ if test "$need_lib_prefix" != no; then ++ # Add the "lib" prefix for modules if required ++ func_stripname '' '.la' "$outputname" ++ name=$func_stripname_result ++ eval shared_ext=\"$shrext_cmds\" ++ eval libname=\"$libname_spec\" ++ else ++ func_stripname '' '.la' "$outputname" ++ libname=$func_stripname_result ++ fi ++ ;; ++ esac ++ ++ if test -n "$objs"; then ++ if test "$deplibs_check_method" != pass_all; then ++ func_fatal_error "cannot build libtool library \`$output' from non-libtool objects on this host:$objs" ++ else ++ $ECHO ++ $ECHO "*** Warning: Linking the shared library $output against the non-libtool" ++ $ECHO "*** objects $objs is not portable!" ++ libobjs="$libobjs $objs" ++ fi ++ fi ++ ++ test "$dlself" != no && \ ++ func_warning "\`-dlopen self' is ignored for libtool libraries" ++ ++ set dummy $rpath ++ shift ++ test "$#" -gt 1 && \ ++ func_warning "ignoring multiple \`-rpath's for a libtool library" ++ ++ install_libdir="$1" ++ ++ oldlibs= ++ if test -z "$rpath"; then ++ if test "$build_libtool_libs" = yes; then ++ # Building a libtool convenience library. ++ # Some compilers have problems with a `.al' extension so ++ # convenience libraries should have the same extension an ++ # archive normally would. ++ oldlibs="$output_objdir/$libname.$libext $oldlibs" ++ build_libtool_libs=convenience ++ build_old_libs=yes ++ fi ++ ++ test -n "$vinfo" && \ ++ func_warning "\`-version-info/-version-number' is ignored for convenience libraries" ++ ++ test -n "$release" && \ ++ func_warning "\`-release' is ignored for convenience libraries" ++ else ++ ++ # Parse the version information argument. ++ save_ifs="$IFS"; IFS=':' ++ set dummy $vinfo 0 0 0 ++ shift ++ IFS="$save_ifs" ++ ++ test -n "$7" && \ ++ func_fatal_help "too many parameters to \`-version-info'" ++ ++ # convert absolute version numbers to libtool ages ++ # this retains compatibility with .la files and attempts ++ # to make the code below a bit more comprehensible ++ ++ case $vinfo_number in ++ yes) ++ number_major="$1" ++ number_minor="$2" ++ number_revision="$3" ++ # ++ # There are really only two kinds -- those that ++ # use the current revision as the major version ++ # and those that subtract age and use age as ++ # a minor version. But, then there is irix ++ # which has an extra 1 added just for fun ++ # ++ case $version_type in ++ darwin|linux|osf|windows|none) ++ func_arith $number_major + $number_minor ++ current=$func_arith_result ++ age="$number_minor" ++ revision="$number_revision" ++ ;; ++ freebsd-aout|freebsd-elf|sunos) ++ current="$number_major" ++ revision="$number_minor" ++ age="0" ++ ;; ++ irix|nonstopux) ++ func_arith $number_major + $number_minor ++ current=$func_arith_result ++ age="$number_minor" ++ revision="$number_minor" ++ lt_irix_increment=no ++ ;; ++ *) ++ func_fatal_configuration "$modename: unknown library version type \`$version_type'" ++ ;; ++ esac ++ ;; ++ no) ++ current="$1" ++ revision="$2" ++ age="$3" ++ ;; ++ esac ++ ++ # Check that each of the things are valid numbers. ++ case $current in ++ 0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;; ++ *) ++ func_error "CURRENT \`$current' must be a nonnegative integer" ++ func_fatal_error "\`$vinfo' is not valid version information" ++ ;; ++ esac ++ ++ case $revision in ++ 0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;; ++ *) ++ func_error "REVISION \`$revision' must be a nonnegative integer" ++ func_fatal_error "\`$vinfo' is not valid version information" ++ ;; ++ esac ++ ++ case $age in ++ 0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;; ++ *) ++ func_error "AGE \`$age' must be a nonnegative integer" ++ func_fatal_error "\`$vinfo' is not valid version information" ++ ;; ++ esac ++ ++ if test "$age" -gt "$current"; then ++ func_error "AGE \`$age' is greater than the current interface number \`$current'" ++ func_fatal_error "\`$vinfo' is not valid version information" ++ fi ++ ++ # Calculate the version variables. ++ major= ++ versuffix= ++ verstring= ++ case $version_type in ++ none) ;; ++ ++ darwin) ++ # Like Linux, but with the current version available in ++ # verstring for coding it into the library header ++ func_arith $current - $age ++ major=.$func_arith_result ++ versuffix="$major.$age.$revision" ++ # Darwin ld doesn't like 0 for these options... ++ func_arith $current + 1 ++ minor_current=$func_arith_result ++ xlcverstring="${wl}-compatibility_version ${wl}$minor_current ${wl}-current_version ${wl}$minor_current.$revision" ++ verstring="-compatibility_version $minor_current -current_version $minor_current.$revision" ++ ;; ++ ++ freebsd-aout) ++ major=".$current" ++ versuffix=".$current.$revision"; ++ ;; ++ ++ freebsd-elf) ++ major=".$current" ++ versuffix=".$current" ++ ;; ++ ++ irix | nonstopux) ++ if test "X$lt_irix_increment" = "Xno"; then ++ func_arith $current - $age ++ else ++ func_arith $current - $age + 1 ++ fi ++ major=$func_arith_result ++ ++ case $version_type in ++ nonstopux) verstring_prefix=nonstopux ;; ++ *) verstring_prefix=sgi ;; ++ esac ++ verstring="$verstring_prefix$major.$revision" ++ ++ # Add in all the interfaces that we are compatible with. ++ loop=$revision ++ while test "$loop" -ne 0; do ++ func_arith $revision - $loop ++ iface=$func_arith_result ++ func_arith $loop - 1 ++ loop=$func_arith_result ++ verstring="$verstring_prefix$major.$iface:$verstring" ++ done ++ ++ # Before this point, $major must not contain `.'. ++ major=.$major ++ versuffix="$major.$revision" ++ ;; ++ ++ linux) ++ func_arith $current - $age ++ major=.$func_arith_result ++ versuffix="$major.$age.$revision" ++ ;; ++ ++ osf) ++ func_arith $current - $age ++ major=.$func_arith_result ++ versuffix=".$current.$age.$revision" ++ verstring="$current.$age.$revision" ++ ++ # Add in all the interfaces that we are compatible with. ++ loop=$age ++ while test "$loop" -ne 0; do ++ func_arith $current - $loop ++ iface=$func_arith_result ++ func_arith $loop - 1 ++ loop=$func_arith_result ++ verstring="$verstring:${iface}.0" ++ done ++ ++ # Make executables depend on our current version. ++ verstring="$verstring:${current}.0" ++ ;; ++ ++ qnx) ++ major=".$current" ++ versuffix=".$current" ++ ;; ++ ++ sunos) ++ major=".$current" ++ versuffix=".$current.$revision" ++ ;; ++ ++ windows) ++ # Use '-' rather than '.', since we only want one ++ # extension on DOS 8.3 filesystems. ++ func_arith $current - $age ++ major=$func_arith_result ++ versuffix="-$major" ++ ;; ++ ++ *) ++ func_fatal_configuration "unknown library version type \`$version_type'" ++ ;; ++ esac ++ ++ # Clear the version info if we defaulted, and they specified a release. ++ if test -z "$vinfo" && test -n "$release"; then ++ major= ++ case $version_type in ++ darwin) ++ # we can't check for "0.0" in archive_cmds due to quoting ++ # problems, so we reset it completely ++ verstring= ++ ;; ++ *) ++ verstring="0.0" ++ ;; ++ esac ++ if test "$need_version" = no; then ++ versuffix= ++ else ++ versuffix=".0.0" ++ fi ++ fi ++ ++ # Remove version info from name if versioning should be avoided ++ if test "$avoid_version" = yes && test "$need_version" = no; then ++ major= ++ versuffix= ++ verstring="" ++ fi ++ ++ # Check to see if the archive will have undefined symbols. ++ if test "$allow_undefined" = yes; then ++ if test "$allow_undefined_flag" = unsupported; then ++ func_warning "undefined symbols not allowed in $host shared libraries" ++ build_libtool_libs=no ++ build_old_libs=yes ++ fi ++ else ++ # Don't allow undefined symbols. ++ allow_undefined_flag="$no_undefined_flag" ++ fi ++ ++ fi ++ ++ func_generate_dlsyms "$libname" "$libname" "yes" ++ libobjs="$libobjs $symfileobj" ++ test "X$libobjs" = "X " && libobjs= ++ ++ if test "$mode" != relink; then ++ # Remove our outputs, but don't remove object files since they ++ # may have been created when compiling PIC objects. ++ removelist= ++ tempremovelist=`$ECHO "$output_objdir/*"` ++ for p in $tempremovelist; do ++ case $p in ++ *.$objext | *.gcno) ++ ;; ++ $output_objdir/$outputname | $output_objdir/$libname.* | $output_objdir/${libname}${release}.*) ++ if test "X$precious_files_regex" != "X"; then ++ if $ECHO "$p" | $EGREP -e "$precious_files_regex" >/dev/null 2>&1 ++ then ++ continue ++ fi ++ fi ++ removelist="$removelist $p" ++ ;; ++ *) ;; ++ esac ++ done ++ test -n "$removelist" && \ ++ func_show_eval "${RM}r \$removelist" ++ fi ++ ++ # Now set the variables for building old libraries. ++ if test "$build_old_libs" = yes && test "$build_libtool_libs" != convenience ; then ++ oldlibs="$oldlibs $output_objdir/$libname.$libext" ++ ++ # Transform .lo files to .o files. ++ oldobjs="$objs "`$ECHO "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}'$/d' -e "$lo2o" | $NL2SP` ++ fi ++ ++ # Eliminate all temporary directories. ++ #for path in $notinst_path; do ++ # lib_search_path=`$ECHO "X$lib_search_path " | $Xsed -e "s% $path % %g"` ++ # deplibs=`$ECHO "X$deplibs " | $Xsed -e "s% -L$path % %g"` ++ # dependency_libs=`$ECHO "X$dependency_libs " | $Xsed -e "s% -L$path % %g"` ++ #done ++ ++ if test -n "$xrpath"; then ++ # If the user specified any rpath flags, then add them. ++ temp_xrpath= ++ for libdir in $xrpath; do ++ temp_xrpath="$temp_xrpath -R$libdir" ++ case "$finalize_rpath " in ++ *" $libdir "*) ;; ++ *) finalize_rpath="$finalize_rpath $libdir" ;; ++ esac ++ done ++ if test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes; then ++ dependency_libs="$temp_xrpath $dependency_libs" ++ fi ++ fi ++ ++ # Make sure dlfiles contains only unique files that won't be dlpreopened ++ old_dlfiles="$dlfiles" ++ dlfiles= ++ for lib in $old_dlfiles; do ++ case " $dlprefiles $dlfiles " in ++ *" $lib "*) ;; ++ *) dlfiles="$dlfiles $lib" ;; ++ esac ++ done ++ ++ # Make sure dlprefiles contains only unique files ++ old_dlprefiles="$dlprefiles" ++ dlprefiles= ++ for lib in $old_dlprefiles; do ++ case "$dlprefiles " in ++ *" $lib "*) ;; ++ *) dlprefiles="$dlprefiles $lib" ;; ++ esac ++ done ++ ++ if test "$build_libtool_libs" = yes; then ++ if test -n "$rpath"; then ++ case $host in ++ *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos* | *-cegcc*) ++ # these systems don't actually have a c library (as such)! ++ ;; ++ *-*-rhapsody* | *-*-darwin1.[012]) ++ # Rhapsody C library is in the System framework ++ deplibs="$deplibs System.ltframework" ++ ;; ++ *-*-netbsd*) ++ # Don't link with libc until the a.out ld.so is fixed. ++ ;; ++ *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*) ++ # Do not include libc due to us having libc/libc_r. ++ ;; ++ *-*-sco3.2v5* | *-*-sco5v6*) ++ # Causes problems with __ctype ++ ;; ++ *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*) ++ # Compiler inserts libc in the correct place for threads to work ++ ;; ++ *) ++ # Add libc to deplibs on all other systems if necessary. ++ if test "$build_libtool_need_lc" = "yes"; then ++ deplibs="$deplibs -lc" ++ fi ++ ;; ++ esac ++ fi ++ ++ # Transform deplibs into only deplibs that can be linked in shared. ++ name_save=$name ++ libname_save=$libname ++ release_save=$release ++ versuffix_save=$versuffix ++ major_save=$major ++ # I'm not sure if I'm treating the release correctly. I think ++ # release should show up in the -l (ie -lgmp5) so we don't want to ++ # add it in twice. Is that correct? ++ release="" ++ versuffix="" ++ major="" ++ newdeplibs= ++ droppeddeps=no ++ case $deplibs_check_method in ++ pass_all) ++ # Don't check for shared/static. Everything works. ++ # This might be a little naive. We might want to check ++ # whether the library exists or not. But this is on ++ # osf3 & osf4 and I'm not really sure... Just ++ # implementing what was already the behavior. ++ newdeplibs=$deplibs ++ ;; ++ test_compile) ++ # This code stresses the "libraries are programs" paradigm to its ++ # limits. Maybe even breaks it. We compile a program, linking it ++ # against the deplibs as a proxy for the library. Then we can check ++ # whether they linked in statically or dynamically with ldd. ++ $opt_dry_run || $RM conftest.c ++ cat > conftest.c <<EOF ++ int main() { return 0; } ++EOF ++ $opt_dry_run || $RM conftest ++ if $LTCC $LTCFLAGS -o conftest conftest.c $deplibs; then ++ ldd_output=`ldd conftest` ++ for i in $deplibs; do ++ case $i in ++ -l*) ++ func_stripname -l '' "$i" ++ name=$func_stripname_result ++ if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then ++ case " $predeps $postdeps " in ++ *" $i "*) ++ newdeplibs="$newdeplibs $i" ++ i="" ++ ;; ++ esac ++ fi ++ if test -n "$i" ; then ++ libname=`eval "\\$ECHO \"$libname_spec\""` ++ deplib_matches=`eval "\\$ECHO \"$library_names_spec\""` ++ set dummy $deplib_matches; shift ++ deplib_match=$1 ++ if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then ++ newdeplibs="$newdeplibs $i" ++ else ++ droppeddeps=yes ++ $ECHO ++ $ECHO "*** Warning: dynamic linker does not accept needed library $i." ++ $ECHO "*** I have the capability to make that library automatically link in when" ++ $ECHO "*** you link to this library. But I can only do this if you have a" ++ $ECHO "*** shared version of the library, which I believe you do not have" ++ $ECHO "*** because a test_compile did reveal that the linker did not use it for" ++ $ECHO "*** its dynamic dependency list that programs get resolved with at runtime." ++ fi ++ fi ++ ;; ++ *) ++ newdeplibs="$newdeplibs $i" ++ ;; ++ esac ++ done ++ else ++ # Error occurred in the first compile. Let's try to salvage ++ # the situation: Compile a separate program for each library. ++ for i in $deplibs; do ++ case $i in ++ -l*) ++ func_stripname -l '' "$i" ++ name=$func_stripname_result ++ $opt_dry_run || $RM conftest ++ if $LTCC $LTCFLAGS -o conftest conftest.c $i; then ++ ldd_output=`ldd conftest` ++ if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then ++ case " $predeps $postdeps " in ++ *" $i "*) ++ newdeplibs="$newdeplibs $i" ++ i="" ++ ;; ++ esac ++ fi ++ if test -n "$i" ; then ++ libname=`eval "\\$ECHO \"$libname_spec\""` ++ deplib_matches=`eval "\\$ECHO \"$library_names_spec\""` ++ set dummy $deplib_matches; shift ++ deplib_match=$1 ++ if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then ++ newdeplibs="$newdeplibs $i" ++ else ++ droppeddeps=yes ++ $ECHO ++ $ECHO "*** Warning: dynamic linker does not accept needed library $i." ++ $ECHO "*** I have the capability to make that library automatically link in when" ++ $ECHO "*** you link to this library. But I can only do this if you have a" ++ $ECHO "*** shared version of the library, which you do not appear to have" ++ $ECHO "*** because a test_compile did reveal that the linker did not use this one" ++ $ECHO "*** as a dynamic dependency that programs can get resolved with at runtime." ++ fi ++ fi ++ else ++ droppeddeps=yes ++ $ECHO ++ $ECHO "*** Warning! Library $i is needed by this library but I was not able to" ++ $ECHO "*** make it link in! You will probably need to install it or some" ++ $ECHO "*** library that it depends on before this library will be fully" ++ $ECHO "*** functional. Installing it before continuing would be even better." ++ fi ++ ;; ++ *) ++ newdeplibs="$newdeplibs $i" ++ ;; ++ esac ++ done ++ fi ++ ;; ++ file_magic*) ++ set dummy $deplibs_check_method; shift ++ file_magic_regex=`expr "$deplibs_check_method" : "$1 \(.*\)"` ++ for a_deplib in $deplibs; do ++ case $a_deplib in ++ -l*) ++ func_stripname -l '' "$a_deplib" ++ name=$func_stripname_result ++ if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then ++ case " $predeps $postdeps " in ++ *" $a_deplib "*) ++ newdeplibs="$newdeplibs $a_deplib" ++ a_deplib="" ++ ;; ++ esac ++ fi ++ if test -n "$a_deplib" ; then ++ libname=`eval "\\$ECHO \"$libname_spec\""` ++ for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do ++ potential_libs=`ls $i/$libname[.-]* 2>/dev/null` ++ for potent_lib in $potential_libs; do ++ # Follow soft links. ++ if ls -lLd "$potent_lib" 2>/dev/null | ++ $GREP " -> " >/dev/null; then ++ continue ++ fi ++ # The statement above tries to avoid entering an ++ # endless loop below, in case of cyclic links. ++ # We might still enter an endless loop, since a link ++ # loop can be closed while we follow links, ++ # but so what? ++ potlib="$potent_lib" ++ while test -h "$potlib" 2>/dev/null; do ++ potliblink=`ls -ld $potlib | ${SED} 's/.* -> //'` ++ case $potliblink in ++ [\\/]* | [A-Za-z]:[\\/]*) potlib="$potliblink";; ++ *) potlib=`$ECHO "X$potlib" | $Xsed -e 's,[^/]*$,,'`"$potliblink";; ++ esac ++ done ++ if eval $file_magic_cmd \"\$potlib\" 2>/dev/null | ++ $SED -e 10q | ++ $EGREP "$file_magic_regex" > /dev/null; then ++ newdeplibs="$newdeplibs $a_deplib" ++ a_deplib="" ++ break 2 ++ fi ++ done ++ done ++ fi ++ if test -n "$a_deplib" ; then ++ droppeddeps=yes ++ $ECHO ++ $ECHO "*** Warning: linker path does not have real file for library $a_deplib." ++ $ECHO "*** I have the capability to make that library automatically link in when" ++ $ECHO "*** you link to this library. But I can only do this if you have a" ++ $ECHO "*** shared version of the library, which you do not appear to have" ++ $ECHO "*** because I did check the linker path looking for a file starting" ++ if test -z "$potlib" ; then ++ $ECHO "*** with $libname but no candidates were found. (...for file magic test)" ++ else ++ $ECHO "*** with $libname and none of the candidates passed a file format test" ++ $ECHO "*** using a file magic. Last file checked: $potlib" ++ fi ++ fi ++ ;; ++ *) ++ # Add a -L argument. ++ newdeplibs="$newdeplibs $a_deplib" ++ ;; ++ esac ++ done # Gone through all deplibs. ++ ;; ++ match_pattern*) ++ set dummy $deplibs_check_method; shift ++ match_pattern_regex=`expr "$deplibs_check_method" : "$1 \(.*\)"` ++ for a_deplib in $deplibs; do ++ case $a_deplib in ++ -l*) ++ func_stripname -l '' "$a_deplib" ++ name=$func_stripname_result ++ if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then ++ case " $predeps $postdeps " in ++ *" $a_deplib "*) ++ newdeplibs="$newdeplibs $a_deplib" ++ a_deplib="" ++ ;; ++ esac ++ fi ++ if test -n "$a_deplib" ; then ++ libname=`eval "\\$ECHO \"$libname_spec\""` ++ for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do ++ potential_libs=`ls $i/$libname[.-]* 2>/dev/null` ++ for potent_lib in $potential_libs; do ++ potlib="$potent_lib" # see symlink-check above in file_magic test ++ if eval "\$ECHO \"X$potent_lib\"" 2>/dev/null | $Xsed -e 10q | \ ++ $EGREP "$match_pattern_regex" > /dev/null; then ++ newdeplibs="$newdeplibs $a_deplib" ++ a_deplib="" ++ break 2 ++ fi ++ done ++ done ++ fi ++ if test -n "$a_deplib" ; then ++ droppeddeps=yes ++ $ECHO ++ $ECHO "*** Warning: linker path does not have real file for library $a_deplib." ++ $ECHO "*** I have the capability to make that library automatically link in when" ++ $ECHO "*** you link to this library. But I can only do this if you have a" ++ $ECHO "*** shared version of the library, which you do not appear to have" ++ $ECHO "*** because I did check the linker path looking for a file starting" ++ if test -z "$potlib" ; then ++ $ECHO "*** with $libname but no candidates were found. (...for regex pattern test)" ++ else ++ $ECHO "*** with $libname and none of the candidates passed a file format test" ++ $ECHO "*** using a regex pattern. Last file checked: $potlib" ++ fi ++ fi ++ ;; ++ *) ++ # Add a -L argument. ++ newdeplibs="$newdeplibs $a_deplib" ++ ;; ++ esac ++ done # Gone through all deplibs. ++ ;; ++ none | unknown | *) ++ newdeplibs="" ++ tmp_deplibs=`$ECHO "X $deplibs" | $Xsed \ ++ -e 's/ -lc$//' -e 's/ -[LR][^ ]*//g'` ++ if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then ++ for i in $predeps $postdeps ; do ++ # can't use Xsed below, because $i might contain '/' ++ tmp_deplibs=`$ECHO "X $tmp_deplibs" | $Xsed -e "s,$i,,"` ++ done ++ fi ++ if $ECHO "X $tmp_deplibs" | $Xsed -e 's/[ ]//g' | ++ $GREP . >/dev/null; then ++ $ECHO ++ if test "X$deplibs_check_method" = "Xnone"; then ++ $ECHO "*** Warning: inter-library dependencies are not supported in this platform." ++ else ++ $ECHO "*** Warning: inter-library dependencies are not known to be supported." ++ fi ++ $ECHO "*** All declared inter-library dependencies are being dropped." ++ droppeddeps=yes ++ fi ++ ;; ++ esac ++ versuffix=$versuffix_save ++ major=$major_save ++ release=$release_save ++ libname=$libname_save ++ name=$name_save ++ ++ case $host in ++ *-*-rhapsody* | *-*-darwin1.[012]) ++ # On Rhapsody replace the C library with the System framework ++ newdeplibs=`$ECHO "X $newdeplibs" | $Xsed -e 's/ -lc / System.ltframework /'` ++ ;; ++ esac ++ ++ if test "$droppeddeps" = yes; then ++ if test "$module" = yes; then ++ $ECHO ++ $ECHO "*** Warning: libtool could not satisfy all declared inter-library" ++ $ECHO "*** dependencies of module $libname. Therefore, libtool will create" ++ $ECHO "*** a static module, that should work as long as the dlopening" ++ $ECHO "*** application is linked with the -dlopen flag." ++ if test -z "$global_symbol_pipe"; then ++ $ECHO ++ $ECHO "*** However, this would only work if libtool was able to extract symbol" ++ $ECHO "*** lists from a program, using \`nm' or equivalent, but libtool could" ++ $ECHO "*** not find such a program. So, this module is probably useless." ++ $ECHO "*** \`nm' from GNU binutils and a full rebuild may help." ++ fi ++ if test "$build_old_libs" = no; then ++ oldlibs="$output_objdir/$libname.$libext" ++ build_libtool_libs=module ++ build_old_libs=yes ++ else ++ build_libtool_libs=no ++ fi ++ else ++ $ECHO "*** The inter-library dependencies that have been dropped here will be" ++ $ECHO "*** automatically added whenever a program is linked with this library" ++ $ECHO "*** or is declared to -dlopen it." ++ ++ if test "$allow_undefined" = no; then ++ $ECHO ++ $ECHO "*** Since this library must not contain undefined symbols," ++ $ECHO "*** because either the platform does not support them or" ++ $ECHO "*** it was explicitly requested with -no-undefined," ++ $ECHO "*** libtool will only create a static version of it." ++ if test "$build_old_libs" = no; then ++ oldlibs="$output_objdir/$libname.$libext" ++ build_libtool_libs=module ++ build_old_libs=yes ++ else ++ build_libtool_libs=no ++ fi ++ fi ++ fi ++ fi ++ # Done checking deplibs! ++ deplibs=$newdeplibs ++ fi ++ # Time to change all our "foo.ltframework" stuff back to "-framework foo" ++ case $host in ++ *-*-darwin*) ++ newdeplibs=`$ECHO "X $newdeplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'` ++ new_inherited_linker_flags=`$ECHO "X $new_inherited_linker_flags" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'` ++ deplibs=`$ECHO "X $deplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'` ++ ;; ++ esac ++ ++ # move library search paths that coincide with paths to not yet ++ # installed libraries to the beginning of the library search list ++ new_libs= ++ for path in $notinst_path; do ++ case " $new_libs " in ++ *" -L$path/$objdir "*) ;; ++ *) ++ case " $deplibs " in ++ *" -L$path/$objdir "*) ++ new_libs="$new_libs -L$path/$objdir" ;; ++ esac ++ ;; ++ esac ++ done ++ for deplib in $deplibs; do ++ case $deplib in ++ -L*) ++ case " $new_libs " in ++ *" $deplib "*) ;; ++ *) new_libs="$new_libs $deplib" ;; ++ esac ++ ;; ++ *) new_libs="$new_libs $deplib" ;; ++ esac ++ done ++ deplibs="$new_libs" ++ ++ # All the library-specific variables (install_libdir is set above). ++ library_names= ++ old_library= ++ dlname= ++ ++ # Test again, we may have decided not to build it any more ++ if test "$build_libtool_libs" = yes; then ++ if test "$hardcode_into_libs" = yes; then ++ # Hardcode the library paths ++ hardcode_libdirs= ++ dep_rpath= ++ rpath="$finalize_rpath" ++ test "$mode" != relink && rpath="$compile_rpath$rpath" ++ for libdir in $rpath; do ++ if test -n "$hardcode_libdir_flag_spec"; then ++ if test -n "$hardcode_libdir_separator"; then ++ if test -z "$hardcode_libdirs"; then ++ hardcode_libdirs="$libdir" ++ else ++ # Just accumulate the unique libdirs. ++ case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in ++ *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*) ++ ;; ++ *) ++ hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir" ++ ;; ++ esac ++ fi ++ else ++ eval flag=\"$hardcode_libdir_flag_spec\" ++ dep_rpath="$dep_rpath $flag" ++ fi ++ elif test -n "$runpath_var"; then ++ case "$perm_rpath " in ++ *" $libdir "*) ;; ++ *) perm_rpath="$perm_rpath $libdir" ;; ++ esac ++ fi ++ done ++ # Substitute the hardcoded libdirs into the rpath. ++ if test -n "$hardcode_libdir_separator" && ++ test -n "$hardcode_libdirs"; then ++ libdir="$hardcode_libdirs" ++ if test -n "$hardcode_libdir_flag_spec_ld"; then ++ eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\" ++ else ++ eval dep_rpath=\"$hardcode_libdir_flag_spec\" ++ fi ++ fi ++ if test -n "$runpath_var" && test -n "$perm_rpath"; then ++ # We should set the runpath_var. ++ rpath= ++ for dir in $perm_rpath; do ++ rpath="$rpath$dir:" ++ done ++ eval "$runpath_var='$rpath\$$runpath_var'; export $runpath_var" ++ fi ++ test -n "$dep_rpath" && deplibs="$dep_rpath $deplibs" ++ fi ++ ++ shlibpath="$finalize_shlibpath" ++ test "$mode" != relink && shlibpath="$compile_shlibpath$shlibpath" ++ if test -n "$shlibpath"; then ++ eval "$shlibpath_var='$shlibpath\$$shlibpath_var'; export $shlibpath_var" ++ fi ++ ++ # Get the real and link names of the library. ++ eval shared_ext=\"$shrext_cmds\" ++ eval library_names=\"$library_names_spec\" ++ set dummy $library_names ++ shift ++ realname="$1" ++ shift ++ ++ if test -n "$soname_spec"; then ++ eval soname=\"$soname_spec\" ++ else ++ soname="$realname" ++ fi ++ if test -z "$dlname"; then ++ dlname=$soname ++ fi ++ ++ lib="$output_objdir/$realname" ++ linknames= ++ for link ++ do ++ linknames="$linknames $link" ++ done ++ ++ # Use standard objects if they are pic ++ test -z "$pic_flag" && libobjs=`$ECHO "X$libobjs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP` ++ test "X$libobjs" = "X " && libobjs= ++ ++ delfiles= ++ if test -n "$export_symbols" && test -n "$include_expsyms"; then ++ $opt_dry_run || cp "$export_symbols" "$output_objdir/$libname.uexp" ++ export_symbols="$output_objdir/$libname.uexp" ++ delfiles="$delfiles $export_symbols" ++ fi ++ ++ orig_export_symbols= ++ case $host_os in ++ cygwin* | mingw* | cegcc*) ++ if test -n "$export_symbols" && test -z "$export_symbols_regex"; then ++ # exporting using user supplied symfile ++ if test "x`$SED 1q $export_symbols`" != xEXPORTS; then ++ # and it's NOT already a .def file. Must figure out ++ # which of the given symbols are data symbols and tag ++ # them as such. So, trigger use of export_symbols_cmds. ++ # export_symbols gets reassigned inside the "prepare ++ # the list of exported symbols" if statement, so the ++ # include_expsyms logic still works. ++ orig_export_symbols="$export_symbols" ++ export_symbols= ++ always_export_symbols=yes ++ fi ++ fi ++ ;; ++ esac ++ ++ # Prepare the list of exported symbols ++ if test -z "$export_symbols"; then ++ if test "$always_export_symbols" = yes || test -n "$export_symbols_regex"; then ++ func_verbose "generating symbol list for \`$libname.la'" ++ export_symbols="$output_objdir/$libname.exp" ++ $opt_dry_run || $RM $export_symbols ++ cmds=$export_symbols_cmds ++ save_ifs="$IFS"; IFS='~' ++ for cmd in $cmds; do ++ IFS="$save_ifs" ++ eval cmd=\"$cmd\" ++ func_len " $cmd" ++ len=$func_len_result ++ if test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then ++ func_show_eval "$cmd" 'exit $?' ++ skipped_export=false ++ else ++ # The command line is too long to execute in one step. ++ func_verbose "using reloadable object file for export list..." ++ skipped_export=: ++ # Break out early, otherwise skipped_export may be ++ # set to false by a later but shorter cmd. ++ break ++ fi ++ done ++ IFS="$save_ifs" ++ if test -n "$export_symbols_regex" && test "X$skipped_export" != "X:"; then ++ func_show_eval '$EGREP -e "$export_symbols_regex" "$export_symbols" > "${export_symbols}T"' ++ func_show_eval '$MV "${export_symbols}T" "$export_symbols"' ++ fi ++ fi ++ fi ++ ++ if test -n "$export_symbols" && test -n "$include_expsyms"; then ++ tmp_export_symbols="$export_symbols" ++ test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols" ++ $opt_dry_run || eval '$ECHO "X$include_expsyms" | $Xsed | $SP2NL >> "$tmp_export_symbols"' ++ fi ++ ++ if test "X$skipped_export" != "X:" && test -n "$orig_export_symbols"; then ++ # The given exports_symbols file has to be filtered, so filter it. ++ func_verbose "filter symbol list for \`$libname.la' to tag DATA exports" ++ # FIXME: $output_objdir/$libname.filter potentially contains lots of ++ # 's' commands which not all seds can handle. GNU sed should be fine ++ # though. Also, the filter scales superlinearly with the number of ++ # global variables. join(1) would be nice here, but unfortunately ++ # isn't a blessed tool. ++ $opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter ++ delfiles="$delfiles $export_symbols $output_objdir/$libname.filter" ++ export_symbols=$output_objdir/$libname.def ++ $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols ++ fi ++ ++ tmp_deplibs= ++ for test_deplib in $deplibs; do ++ case " $convenience " in ++ *" $test_deplib "*) ;; ++ *) ++ tmp_deplibs="$tmp_deplibs $test_deplib" ++ ;; ++ esac ++ done ++ deplibs="$tmp_deplibs" ++ ++ if test -n "$convenience"; then ++ if test -n "$whole_archive_flag_spec" && ++ test "$compiler_needs_object" = yes && ++ test -z "$libobjs"; then ++ # extract the archives, so we have objects to list. ++ # TODO: could optimize this to just extract one archive. ++ whole_archive_flag_spec= ++ fi ++ if test -n "$whole_archive_flag_spec"; then ++ save_libobjs=$libobjs ++ eval libobjs=\"\$libobjs $whole_archive_flag_spec\" ++ test "X$libobjs" = "X " && libobjs= ++ else ++ gentop="$output_objdir/${outputname}x" ++ generated="$generated $gentop" ++ ++ func_extract_archives $gentop $convenience ++ libobjs="$libobjs $func_extract_archives_result" ++ test "X$libobjs" = "X " && libobjs= ++ fi ++ fi ++ ++ if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then ++ eval flag=\"$thread_safe_flag_spec\" ++ linker_flags="$linker_flags $flag" ++ fi ++ ++ # Make a backup of the uninstalled library when relinking ++ if test "$mode" = relink; then ++ $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}U && $MV $realname ${realname}U)' || exit $? ++ fi ++ ++ # Do each of the archive commands. ++ if test "$module" = yes && test -n "$module_cmds" ; then ++ if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then ++ eval test_cmds=\"$module_expsym_cmds\" ++ cmds=$module_expsym_cmds ++ else ++ eval test_cmds=\"$module_cmds\" ++ cmds=$module_cmds ++ fi ++ else ++ if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then ++ eval test_cmds=\"$archive_expsym_cmds\" ++ cmds=$archive_expsym_cmds ++ else ++ eval test_cmds=\"$archive_cmds\" ++ cmds=$archive_cmds ++ fi ++ fi ++ ++ if test "X$skipped_export" != "X:" && ++ func_len " $test_cmds" && ++ len=$func_len_result && ++ test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then ++ : ++ else ++ # The command line is too long to link in one step, link piecewise ++ # or, if using GNU ld and skipped_export is not :, use a linker ++ # script. ++ ++ # Save the value of $output and $libobjs because we want to ++ # use them later. If we have whole_archive_flag_spec, we ++ # want to use save_libobjs as it was before ++ # whole_archive_flag_spec was expanded, because we can't ++ # assume the linker understands whole_archive_flag_spec. ++ # This may have to be revisited, in case too many ++ # convenience libraries get linked in and end up exceeding ++ # the spec. ++ if test -z "$convenience" || test -z "$whole_archive_flag_spec"; then ++ save_libobjs=$libobjs ++ fi ++ save_output=$output ++ output_la=`$ECHO "X$output" | $Xsed -e "$basename"` ++ ++ # Clear the reloadable object creation command queue and ++ # initialize k to one. ++ test_cmds= ++ concat_cmds= ++ objlist= ++ last_robj= ++ k=1 ++ ++ if test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "$with_gnu_ld" = yes; then ++ output=${output_objdir}/${output_la}.lnkscript ++ func_verbose "creating GNU ld script: $output" ++ $ECHO 'INPUT (' > $output ++ for obj in $save_libobjs ++ do ++ $ECHO "$obj" >> $output ++ done ++ $ECHO ')' >> $output ++ delfiles="$delfiles $output" ++ elif test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "X$file_list_spec" != X; then ++ output=${output_objdir}/${output_la}.lnk ++ func_verbose "creating linker input file list: $output" ++ : > $output ++ set x $save_libobjs ++ shift ++ firstobj= ++ if test "$compiler_needs_object" = yes; then ++ firstobj="$1 " ++ shift ++ fi ++ for obj ++ do ++ $ECHO "$obj" >> $output ++ done ++ delfiles="$delfiles $output" ++ output=$firstobj\"$file_list_spec$output\" ++ else ++ if test -n "$save_libobjs"; then ++ func_verbose "creating reloadable object files..." ++ output=$output_objdir/$output_la-${k}.$objext ++ eval test_cmds=\"$reload_cmds\" ++ func_len " $test_cmds" ++ len0=$func_len_result ++ len=$len0 ++ ++ # Loop over the list of objects to be linked. ++ for obj in $save_libobjs ++ do ++ func_len " $obj" ++ func_arith $len + $func_len_result ++ len=$func_arith_result ++ if test "X$objlist" = X || ++ test "$len" -lt "$max_cmd_len"; then ++ func_append objlist " $obj" ++ else ++ # The command $test_cmds is almost too long, add a ++ # command to the queue. ++ if test "$k" -eq 1 ; then ++ # The first file doesn't have a previous command to add. ++ eval concat_cmds=\"$reload_cmds $objlist $last_robj\" ++ else ++ # All subsequent reloadable object files will link in ++ # the last one created. ++ eval concat_cmds=\"\$concat_cmds~$reload_cmds $objlist $last_robj~\$RM $last_robj\" ++ fi ++ last_robj=$output_objdir/$output_la-${k}.$objext ++ func_arith $k + 1 ++ k=$func_arith_result ++ output=$output_objdir/$output_la-${k}.$objext ++ objlist=$obj ++ func_len " $last_robj" ++ func_arith $len0 + $func_len_result ++ len=$func_arith_result ++ fi ++ done ++ # Handle the remaining objects by creating one last ++ # reloadable object file. All subsequent reloadable object ++ # files will link in the last one created. ++ test -z "$concat_cmds" || concat_cmds=$concat_cmds~ ++ eval concat_cmds=\"\${concat_cmds}$reload_cmds $objlist $last_robj\" ++ if test -n "$last_robj"; then ++ eval concat_cmds=\"\${concat_cmds}~\$RM $last_robj\" ++ fi ++ delfiles="$delfiles $output" ++ ++ else ++ output= ++ fi ++ ++ if ${skipped_export-false}; then ++ func_verbose "generating symbol list for \`$libname.la'" ++ export_symbols="$output_objdir/$libname.exp" ++ $opt_dry_run || $RM $export_symbols ++ libobjs=$output ++ # Append the command to create the export file. ++ test -z "$concat_cmds" || concat_cmds=$concat_cmds~ ++ eval concat_cmds=\"\$concat_cmds$export_symbols_cmds\" ++ if test -n "$last_robj"; then ++ eval concat_cmds=\"\$concat_cmds~\$RM $last_robj\" ++ fi ++ fi ++ ++ test -n "$save_libobjs" && ++ func_verbose "creating a temporary reloadable object file: $output" ++ ++ # Loop through the commands generated above and execute them. ++ save_ifs="$IFS"; IFS='~' ++ for cmd in $concat_cmds; do ++ IFS="$save_ifs" ++ $opt_silent || { ++ func_quote_for_expand "$cmd" ++ eval "func_echo $func_quote_for_expand_result" ++ } ++ $opt_dry_run || eval "$cmd" || { ++ lt_exit=$? ++ ++ # Restore the uninstalled library and exit ++ if test "$mode" = relink; then ++ ( cd "$output_objdir" && \ ++ $RM "${realname}T" && \ ++ $MV "${realname}U" "$realname" ) ++ fi ++ ++ exit $lt_exit ++ } ++ done ++ IFS="$save_ifs" ++ ++ if test -n "$export_symbols_regex" && ${skipped_export-false}; then ++ func_show_eval '$EGREP -e "$export_symbols_regex" "$export_symbols" > "${export_symbols}T"' ++ func_show_eval '$MV "${export_symbols}T" "$export_symbols"' ++ fi ++ fi ++ ++ if ${skipped_export-false}; then ++ if test -n "$export_symbols" && test -n "$include_expsyms"; then ++ tmp_export_symbols="$export_symbols" ++ test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols" ++ $opt_dry_run || eval '$ECHO "X$include_expsyms" | $Xsed | $SP2NL >> "$tmp_export_symbols"' ++ fi ++ ++ if test -n "$orig_export_symbols"; then ++ # The given exports_symbols file has to be filtered, so filter it. ++ func_verbose "filter symbol list for \`$libname.la' to tag DATA exports" ++ # FIXME: $output_objdir/$libname.filter potentially contains lots of ++ # 's' commands which not all seds can handle. GNU sed should be fine ++ # though. Also, the filter scales superlinearly with the number of ++ # global variables. join(1) would be nice here, but unfortunately ++ # isn't a blessed tool. ++ $opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter ++ delfiles="$delfiles $export_symbols $output_objdir/$libname.filter" ++ export_symbols=$output_objdir/$libname.def ++ $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols ++ fi ++ fi ++ ++ libobjs=$output ++ # Restore the value of output. ++ output=$save_output ++ ++ if test -n "$convenience" && test -n "$whole_archive_flag_spec"; then ++ eval libobjs=\"\$libobjs $whole_archive_flag_spec\" ++ test "X$libobjs" = "X " && libobjs= ++ fi ++ # Expand the library linking commands again to reset the ++ # value of $libobjs for piecewise linking. ++ ++ # Do each of the archive commands. ++ if test "$module" = yes && test -n "$module_cmds" ; then ++ if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then ++ cmds=$module_expsym_cmds ++ else ++ cmds=$module_cmds ++ fi ++ else ++ if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then ++ cmds=$archive_expsym_cmds ++ else ++ cmds=$archive_cmds ++ fi ++ fi ++ fi ++ ++ if test -n "$delfiles"; then ++ # Append the command to remove temporary files to $cmds. ++ eval cmds=\"\$cmds~\$RM $delfiles\" ++ fi ++ ++ # Add any objects from preloaded convenience libraries ++ if test -n "$dlprefiles"; then ++ gentop="$output_objdir/${outputname}x" ++ generated="$generated $gentop" ++ ++ func_extract_archives $gentop $dlprefiles ++ libobjs="$libobjs $func_extract_archives_result" ++ test "X$libobjs" = "X " && libobjs= ++ fi ++ ++ save_ifs="$IFS"; IFS='~' ++ for cmd in $cmds; do ++ IFS="$save_ifs" ++ eval cmd=\"$cmd\" ++ $opt_silent || { ++ func_quote_for_expand "$cmd" ++ eval "func_echo $func_quote_for_expand_result" ++ } ++ $opt_dry_run || eval "$cmd" || { ++ lt_exit=$? ++ ++ # Restore the uninstalled library and exit ++ if test "$mode" = relink; then ++ ( cd "$output_objdir" && \ ++ $RM "${realname}T" && \ ++ $MV "${realname}U" "$realname" ) ++ fi ++ ++ exit $lt_exit ++ } ++ done ++ IFS="$save_ifs" ++ ++ # Restore the uninstalled library and exit ++ if test "$mode" = relink; then ++ $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}T && $MV $realname ${realname}T && $MV ${realname}U $realname)' || exit $? ++ ++ if test -n "$convenience"; then ++ if test -z "$whole_archive_flag_spec"; then ++ func_show_eval '${RM}r "$gentop"' ++ fi ++ fi ++ ++ exit $EXIT_SUCCESS ++ fi ++ ++ # Create links to the real library. ++ for linkname in $linknames; do ++ if test "$realname" != "$linkname"; then ++ func_show_eval '(cd "$output_objdir" && $RM "$linkname" && $LN_S "$realname" "$linkname")' 'exit $?' ++ fi ++ done ++ ++ # If -module or -export-dynamic was specified, set the dlname. ++ if test "$module" = yes || test "$export_dynamic" = yes; then ++ # On all known operating systems, these are identical. ++ dlname="$soname" ++ fi ++ fi ++ ;; ++ ++ obj) ++ if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then ++ func_warning "\`-dlopen' is ignored for objects" ++ fi ++ ++ case " $deplibs" in ++ *\ -l* | *\ -L*) ++ func_warning "\`-l' and \`-L' are ignored for objects" ;; ++ esac ++ ++ test -n "$rpath" && \ ++ func_warning "\`-rpath' is ignored for objects" ++ ++ test -n "$xrpath" && \ ++ func_warning "\`-R' is ignored for objects" ++ ++ test -n "$vinfo" && \ ++ func_warning "\`-version-info' is ignored for objects" ++ ++ test -n "$release" && \ ++ func_warning "\`-release' is ignored for objects" ++ ++ case $output in ++ *.lo) ++ test -n "$objs$old_deplibs" && \ ++ func_fatal_error "cannot build library object \`$output' from non-libtool objects" ++ ++ libobj=$output ++ func_lo2o "$libobj" ++ obj=$func_lo2o_result ++ ;; ++ *) ++ libobj= ++ obj="$output" ++ ;; ++ esac ++ ++ # Delete the old objects. ++ $opt_dry_run || $RM $obj $libobj ++ ++ # Objects from convenience libraries. This assumes ++ # single-version convenience libraries. Whenever we create ++ # different ones for PIC/non-PIC, this we'll have to duplicate ++ # the extraction. ++ reload_conv_objs= ++ gentop= ++ # reload_cmds runs $LD directly, so let us get rid of ++ # -Wl from whole_archive_flag_spec and hope we can get by with ++ # turning comma into space.. ++ wl= ++ ++ if test -n "$convenience"; then ++ if test -n "$whole_archive_flag_spec"; then ++ eval tmp_whole_archive_flags=\"$whole_archive_flag_spec\" ++ reload_conv_objs=$reload_objs\ `$ECHO "X$tmp_whole_archive_flags" | $Xsed -e 's|,| |g'` ++ else ++ gentop="$output_objdir/${obj}x" ++ generated="$generated $gentop" ++ ++ func_extract_archives $gentop $convenience ++ reload_conv_objs="$reload_objs $func_extract_archives_result" ++ fi ++ fi ++ ++ # Create the old-style object. ++ reload_objs="$objs$old_deplibs "`$ECHO "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}$'/d' -e '/\.lib$/d' -e "$lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test ++ ++ output="$obj" ++ func_execute_cmds "$reload_cmds" 'exit $?' ++ ++ # Exit if we aren't doing a library object file. ++ if test -z "$libobj"; then ++ if test -n "$gentop"; then ++ func_show_eval '${RM}r "$gentop"' ++ fi ++ ++ exit $EXIT_SUCCESS ++ fi ++ ++ if test "$build_libtool_libs" != yes; then ++ if test -n "$gentop"; then ++ func_show_eval '${RM}r "$gentop"' ++ fi ++ ++ # Create an invalid libtool object if no PIC, so that we don't ++ # accidentally link it into a program. ++ # $show "echo timestamp > $libobj" ++ # $opt_dry_run || eval "echo timestamp > $libobj" || exit $? ++ exit $EXIT_SUCCESS ++ fi ++ ++ if test -n "$pic_flag" || test "$pic_mode" != default; then ++ # Only do commands if we really have different PIC objects. ++ reload_objs="$libobjs $reload_conv_objs" ++ output="$libobj" ++ func_execute_cmds "$reload_cmds" 'exit $?' ++ fi ++ ++ if test -n "$gentop"; then ++ func_show_eval '${RM}r "$gentop"' ++ fi ++ ++ exit $EXIT_SUCCESS ++ ;; ++ ++ prog) ++ case $host in ++ *cygwin*) func_stripname '' '.exe' "$output" ++ output=$func_stripname_result.exe;; ++ esac ++ test -n "$vinfo" && \ ++ func_warning "\`-version-info' is ignored for programs" ++ ++ test -n "$release" && \ ++ func_warning "\`-release' is ignored for programs" ++ ++ test "$preload" = yes \ ++ && test "$dlopen_support" = unknown \ ++ && test "$dlopen_self" = unknown \ ++ && test "$dlopen_self_static" = unknown && \ ++ func_warning "\`LT_INIT([dlopen])' not used. Assuming no dlopen support." ++ ++ case $host in ++ *-*-rhapsody* | *-*-darwin1.[012]) ++ # On Rhapsody replace the C library is the System framework ++ compile_deplibs=`$ECHO "X $compile_deplibs" | $Xsed -e 's/ -lc / System.ltframework /'` ++ finalize_deplibs=`$ECHO "X $finalize_deplibs" | $Xsed -e 's/ -lc / System.ltframework /'` ++ ;; ++ esac ++ ++ case $host in ++ *-*-darwin*) ++ # Don't allow lazy linking, it breaks C++ global constructors ++ # But is supposedly fixed on 10.4 or later (yay!). ++ if test "$tagname" = CXX ; then ++ case ${MACOSX_DEPLOYMENT_TARGET-10.0} in ++ 10.[0123]) ++ compile_command="$compile_command ${wl}-bind_at_load" ++ finalize_command="$finalize_command ${wl}-bind_at_load" ++ ;; ++ esac ++ fi ++ # Time to change all our "foo.ltframework" stuff back to "-framework foo" ++ compile_deplibs=`$ECHO "X $compile_deplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'` ++ finalize_deplibs=`$ECHO "X $finalize_deplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'` ++ ;; ++ esac ++ ++ ++ # move library search paths that coincide with paths to not yet ++ # installed libraries to the beginning of the library search list ++ new_libs= ++ for path in $notinst_path; do ++ case " $new_libs " in ++ *" -L$path/$objdir "*) ;; ++ *) ++ case " $compile_deplibs " in ++ *" -L$path/$objdir "*) ++ new_libs="$new_libs -L$path/$objdir" ;; ++ esac ++ ;; ++ esac ++ done ++ for deplib in $compile_deplibs; do ++ case $deplib in ++ -L*) ++ case " $new_libs " in ++ *" $deplib "*) ;; ++ *) new_libs="$new_libs $deplib" ;; ++ esac ++ ;; ++ *) new_libs="$new_libs $deplib" ;; ++ esac ++ done ++ compile_deplibs="$new_libs" ++ ++ ++ compile_command="$compile_command $compile_deplibs" ++ finalize_command="$finalize_command $finalize_deplibs" ++ ++ if test -n "$rpath$xrpath"; then ++ # If the user specified any rpath flags, then add them. ++ for libdir in $rpath $xrpath; do ++ # This is the magic to use -rpath. ++ case "$finalize_rpath " in ++ *" $libdir "*) ;; ++ *) finalize_rpath="$finalize_rpath $libdir" ;; ++ esac ++ done ++ fi ++ ++ # Now hardcode the library paths ++ rpath= ++ hardcode_libdirs= ++ for libdir in $compile_rpath $finalize_rpath; do ++ if test -n "$hardcode_libdir_flag_spec"; then ++ if test -n "$hardcode_libdir_separator"; then ++ if test -z "$hardcode_libdirs"; then ++ hardcode_libdirs="$libdir" ++ else ++ # Just accumulate the unique libdirs. ++ case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in ++ *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*) ++ ;; ++ *) ++ hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir" ++ ;; ++ esac ++ fi ++ else ++ eval flag=\"$hardcode_libdir_flag_spec\" ++ rpath="$rpath $flag" ++ fi ++ elif test -n "$runpath_var"; then ++ case "$perm_rpath " in ++ *" $libdir "*) ;; ++ *) perm_rpath="$perm_rpath $libdir" ;; ++ esac ++ fi ++ case $host in ++ *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*) ++ testbindir=`${ECHO} "$libdir" | ${SED} -e 's*/lib$*/bin*'` ++ case :$dllsearchpath: in ++ *":$libdir:"*) ;; ++ ::) dllsearchpath=$libdir;; ++ *) dllsearchpath="$dllsearchpath:$libdir";; ++ esac ++ case :$dllsearchpath: in ++ *":$testbindir:"*) ;; ++ ::) dllsearchpath=$testbindir;; ++ *) dllsearchpath="$dllsearchpath:$testbindir";; ++ esac ++ ;; ++ esac ++ done ++ # Substitute the hardcoded libdirs into the rpath. ++ if test -n "$hardcode_libdir_separator" && ++ test -n "$hardcode_libdirs"; then ++ libdir="$hardcode_libdirs" ++ eval rpath=\" $hardcode_libdir_flag_spec\" ++ fi ++ compile_rpath="$rpath" ++ ++ rpath= ++ hardcode_libdirs= ++ for libdir in $finalize_rpath; do ++ if test -n "$hardcode_libdir_flag_spec"; then ++ if test -n "$hardcode_libdir_separator"; then ++ if test -z "$hardcode_libdirs"; then ++ hardcode_libdirs="$libdir" ++ else ++ # Just accumulate the unique libdirs. ++ case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in ++ *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*) ++ ;; ++ *) ++ hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir" ++ ;; ++ esac ++ fi ++ else ++ eval flag=\"$hardcode_libdir_flag_spec\" ++ rpath="$rpath $flag" ++ fi ++ elif test -n "$runpath_var"; then ++ case "$finalize_perm_rpath " in ++ *" $libdir "*) ;; ++ *) finalize_perm_rpath="$finalize_perm_rpath $libdir" ;; ++ esac ++ fi ++ done ++ # Substitute the hardcoded libdirs into the rpath. ++ if test -n "$hardcode_libdir_separator" && ++ test -n "$hardcode_libdirs"; then ++ libdir="$hardcode_libdirs" ++ eval rpath=\" $hardcode_libdir_flag_spec\" ++ fi ++ finalize_rpath="$rpath" ++ ++ if test -n "$libobjs" && test "$build_old_libs" = yes; then ++ # Transform all the library objects into standard objects. ++ compile_command=`$ECHO "X$compile_command" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP` ++ finalize_command=`$ECHO "X$finalize_command" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP` ++ fi ++ ++ func_generate_dlsyms "$outputname" "@PROGRAM@" "no" ++ ++ # template prelinking step ++ if test -n "$prelink_cmds"; then ++ func_execute_cmds "$prelink_cmds" 'exit $?' ++ fi ++ ++ wrappers_required=yes ++ case $host in ++ *cygwin* | *mingw* ) ++ if test "$build_libtool_libs" != yes; then ++ wrappers_required=no ++ fi ++ ;; ++ *cegcc) ++ # Disable wrappers for cegcc, we are cross compiling anyway. ++ wrappers_required=no ++ ;; ++ *) ++ if test "$need_relink" = no || test "$build_libtool_libs" != yes; then ++ wrappers_required=no ++ fi ++ ;; ++ esac ++ if test "$wrappers_required" = no; then ++ # Replace the output file specification. ++ compile_command=`$ECHO "X$compile_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'` ++ link_command="$compile_command$compile_rpath" ++ ++ # We have no uninstalled library dependencies, so finalize right now. ++ exit_status=0 ++ func_show_eval "$link_command" 'exit_status=$?' ++ ++ # Delete the generated files. ++ if test -f "$output_objdir/${outputname}S.${objext}"; then ++ func_show_eval '$RM "$output_objdir/${outputname}S.${objext}"' ++ fi ++ ++ exit $exit_status ++ fi ++ ++ if test -n "$compile_shlibpath$finalize_shlibpath"; then ++ compile_command="$shlibpath_var=\"$compile_shlibpath$finalize_shlibpath\$$shlibpath_var\" $compile_command" ++ fi ++ if test -n "$finalize_shlibpath"; then ++ finalize_command="$shlibpath_var=\"$finalize_shlibpath\$$shlibpath_var\" $finalize_command" ++ fi ++ ++ compile_var= ++ finalize_var= ++ if test -n "$runpath_var"; then ++ if test -n "$perm_rpath"; then ++ # We should set the runpath_var. ++ rpath= ++ for dir in $perm_rpath; do ++ rpath="$rpath$dir:" ++ done ++ compile_var="$runpath_var=\"$rpath\$$runpath_var\" " ++ fi ++ if test -n "$finalize_perm_rpath"; then ++ # We should set the runpath_var. ++ rpath= ++ for dir in $finalize_perm_rpath; do ++ rpath="$rpath$dir:" ++ done ++ finalize_var="$runpath_var=\"$rpath\$$runpath_var\" " ++ fi ++ fi ++ ++ if test "$no_install" = yes; then ++ # We don't need to create a wrapper script. ++ link_command="$compile_var$compile_command$compile_rpath" ++ # Replace the output file specification. ++ link_command=`$ECHO "X$link_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'` ++ # Delete the old output file. ++ $opt_dry_run || $RM $output ++ # Link the executable and exit ++ func_show_eval "$link_command" 'exit $?' ++ exit $EXIT_SUCCESS ++ fi ++ ++ if test "$hardcode_action" = relink; then ++ # Fast installation is not supported ++ link_command="$compile_var$compile_command$compile_rpath" ++ relink_command="$finalize_var$finalize_command$finalize_rpath" ++ ++ func_warning "this platform does not like uninstalled shared libraries" ++ func_warning "\`$output' will be relinked during installation" ++ else ++ if test "$fast_install" != no; then ++ link_command="$finalize_var$compile_command$finalize_rpath" ++ if test "$fast_install" = yes; then ++ relink_command=`$ECHO "X$compile_var$compile_command$compile_rpath" | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g'` ++ else ++ # fast_install is set to needless ++ relink_command= ++ fi ++ else ++ link_command="$compile_var$compile_command$compile_rpath" ++ relink_command="$finalize_var$finalize_command$finalize_rpath" ++ fi ++ fi ++ ++ # Replace the output file specification. ++ link_command=`$ECHO "X$link_command" | $Xsed -e 's%@OUTPUT@%'"$output_objdir/$outputname"'%g'` ++ ++ # Delete the old output files. ++ $opt_dry_run || $RM $output $output_objdir/$outputname $output_objdir/lt-$outputname ++ ++ func_show_eval "$link_command" 'exit $?' ++ ++ # Now create the wrapper script. ++ func_verbose "creating $output" ++ ++ # Quote the relink command for shipping. ++ if test -n "$relink_command"; then ++ # Preserve any variables that may affect compiler behavior ++ for var in $variables_saved_for_relink; do ++ if eval test -z \"\${$var+set}\"; then ++ relink_command="{ test -z \"\${$var+set}\" || $lt_unset $var || { $var=; export $var; }; }; $relink_command" ++ elif eval var_value=\$$var; test -z "$var_value"; then ++ relink_command="$var=; export $var; $relink_command" ++ else ++ func_quote_for_eval "$var_value" ++ relink_command="$var=$func_quote_for_eval_result; export $var; $relink_command" ++ fi ++ done ++ relink_command="(cd `pwd`; $relink_command)" ++ relink_command=`$ECHO "X$relink_command" | $Xsed -e "$sed_quote_subst"` ++ fi ++ ++ # Quote $ECHO for shipping. ++ if test "X$ECHO" = "X$SHELL $progpath --fallback-echo"; then ++ case $progpath in ++ [\\/]* | [A-Za-z]:[\\/]*) qecho="$SHELL $progpath --fallback-echo";; ++ *) qecho="$SHELL `pwd`/$progpath --fallback-echo";; ++ esac ++ qecho=`$ECHO "X$qecho" | $Xsed -e "$sed_quote_subst"` ++ else ++ qecho=`$ECHO "X$ECHO" | $Xsed -e "$sed_quote_subst"` ++ fi ++ ++ # Only actually do things if not in dry run mode. ++ $opt_dry_run || { ++ # win32 will think the script is a binary if it has ++ # a .exe suffix, so we strip it off here. ++ case $output in ++ *.exe) func_stripname '' '.exe' "$output" ++ output=$func_stripname_result ;; ++ esac ++ # test for cygwin because mv fails w/o .exe extensions ++ case $host in ++ *cygwin*) ++ exeext=.exe ++ func_stripname '' '.exe' "$outputname" ++ outputname=$func_stripname_result ;; ++ *) exeext= ;; ++ esac ++ case $host in ++ *cygwin* | *mingw* ) ++ func_dirname_and_basename "$output" "" "." ++ output_name=$func_basename_result ++ output_path=$func_dirname_result ++ cwrappersource="$output_path/$objdir/lt-$output_name.c" ++ cwrapper="$output_path/$output_name.exe" ++ $RM $cwrappersource $cwrapper ++ trap "$RM $cwrappersource $cwrapper; exit $EXIT_FAILURE" 1 2 15 ++ ++ func_emit_cwrapperexe_src > $cwrappersource ++ ++ # The wrapper executable is built using the $host compiler, ++ # because it contains $host paths and files. If cross- ++ # compiling, it, like the target executable, must be ++ # executed on the $host or under an emulation environment. ++ $opt_dry_run || { ++ $LTCC $LTCFLAGS -o $cwrapper $cwrappersource ++ $STRIP $cwrapper ++ } ++ ++ # Now, create the wrapper script for func_source use: ++ func_ltwrapper_scriptname $cwrapper ++ $RM $func_ltwrapper_scriptname_result ++ trap "$RM $func_ltwrapper_scriptname_result; exit $EXIT_FAILURE" 1 2 15 ++ $opt_dry_run || { ++ # note: this script will not be executed, so do not chmod. ++ if test "x$build" = "x$host" ; then ++ $cwrapper --lt-dump-script > $func_ltwrapper_scriptname_result ++ else ++ func_emit_wrapper no > $func_ltwrapper_scriptname_result ++ fi ++ } ++ ;; ++ * ) ++ $RM $output ++ trap "$RM $output; exit $EXIT_FAILURE" 1 2 15 ++ ++ func_emit_wrapper no > $output ++ chmod +x $output ++ ;; ++ esac ++ } ++ exit $EXIT_SUCCESS ++ ;; ++ esac ++ ++ # See if we need to build an old-fashioned archive. ++ for oldlib in $oldlibs; do ++ ++ if test "$build_libtool_libs" = convenience; then ++ oldobjs="$libobjs_save $symfileobj" ++ addlibs="$convenience" ++ build_libtool_libs=no ++ else ++ if test "$build_libtool_libs" = module; then ++ oldobjs="$libobjs_save" ++ build_libtool_libs=no ++ else ++ oldobjs="$old_deplibs $non_pic_objects" ++ if test "$preload" = yes && test -f "$symfileobj"; then ++ oldobjs="$oldobjs $symfileobj" ++ fi ++ fi ++ addlibs="$old_convenience" ++ fi ++ ++ if test -n "$addlibs"; then ++ gentop="$output_objdir/${outputname}x" ++ generated="$generated $gentop" ++ ++ func_extract_archives $gentop $addlibs ++ oldobjs="$oldobjs $func_extract_archives_result" ++ fi ++ ++ # Do each command in the archive commands. ++ if test -n "$old_archive_from_new_cmds" && test "$build_libtool_libs" = yes; then ++ cmds=$old_archive_from_new_cmds ++ else ++ ++ # Add any objects from preloaded convenience libraries ++ if test -n "$dlprefiles"; then ++ gentop="$output_objdir/${outputname}x" ++ generated="$generated $gentop" ++ ++ func_extract_archives $gentop $dlprefiles ++ oldobjs="$oldobjs $func_extract_archives_result" ++ fi ++ ++ # POSIX demands no paths to be encoded in archives. We have ++ # to avoid creating archives with duplicate basenames if we ++ # might have to extract them afterwards, e.g., when creating a ++ # static archive out of a convenience library, or when linking ++ # the entirety of a libtool archive into another (currently ++ # not supported by libtool). ++ if (for obj in $oldobjs ++ do ++ func_basename "$obj" ++ $ECHO "$func_basename_result" ++ done | sort | sort -uc >/dev/null 2>&1); then ++ : ++ else ++ $ECHO "copying selected object files to avoid basename conflicts..." ++ gentop="$output_objdir/${outputname}x" ++ generated="$generated $gentop" ++ func_mkdir_p "$gentop" ++ save_oldobjs=$oldobjs ++ oldobjs= ++ counter=1 ++ for obj in $save_oldobjs ++ do ++ func_basename "$obj" ++ objbase="$func_basename_result" ++ case " $oldobjs " in ++ " ") oldobjs=$obj ;; ++ *[\ /]"$objbase "*) ++ while :; do ++ # Make sure we don't pick an alternate name that also ++ # overlaps. ++ newobj=lt$counter-$objbase ++ func_arith $counter + 1 ++ counter=$func_arith_result ++ case " $oldobjs " in ++ *[\ /]"$newobj "*) ;; ++ *) if test ! -f "$gentop/$newobj"; then break; fi ;; ++ esac ++ done ++ func_show_eval "ln $obj $gentop/$newobj || cp $obj $gentop/$newobj" ++ oldobjs="$oldobjs $gentop/$newobj" ++ ;; ++ *) oldobjs="$oldobjs $obj" ;; ++ esac ++ done ++ fi ++ eval cmds=\"$old_archive_cmds\" ++ ++ func_len " $cmds" ++ len=$func_len_result ++ if test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then ++ cmds=$old_archive_cmds ++ else ++ # the command line is too long to link in one step, link in parts ++ func_verbose "using piecewise archive linking..." ++ save_RANLIB=$RANLIB ++ RANLIB=: ++ objlist= ++ concat_cmds= ++ save_oldobjs=$oldobjs ++ oldobjs= ++ # Is there a better way of finding the last object in the list? ++ for obj in $save_oldobjs ++ do ++ last_oldobj=$obj ++ done ++ eval test_cmds=\"$old_archive_cmds\" ++ func_len " $test_cmds" ++ len0=$func_len_result ++ len=$len0 ++ for obj in $save_oldobjs ++ do ++ func_len " $obj" ++ func_arith $len + $func_len_result ++ len=$func_arith_result ++ func_append objlist " $obj" ++ if test "$len" -lt "$max_cmd_len"; then ++ : ++ else ++ # the above command should be used before it gets too long ++ oldobjs=$objlist ++ if test "$obj" = "$last_oldobj" ; then ++ RANLIB=$save_RANLIB ++ fi ++ test -z "$concat_cmds" || concat_cmds=$concat_cmds~ ++ eval concat_cmds=\"\${concat_cmds}$old_archive_cmds\" ++ objlist= ++ len=$len0 ++ fi ++ done ++ RANLIB=$save_RANLIB ++ oldobjs=$objlist ++ if test "X$oldobjs" = "X" ; then ++ eval cmds=\"\$concat_cmds\" ++ else ++ eval cmds=\"\$concat_cmds~\$old_archive_cmds\" ++ fi ++ fi ++ fi ++ func_execute_cmds "$cmds" 'exit $?' ++ done ++ ++ test -n "$generated" && \ ++ func_show_eval "${RM}r$generated" ++ ++ # Now create the libtool archive. ++ case $output in ++ *.la) ++ old_library= ++ test "$build_old_libs" = yes && old_library="$libname.$libext" ++ func_verbose "creating $output" ++ ++ # Preserve any variables that may affect compiler behavior ++ for var in $variables_saved_for_relink; do ++ if eval test -z \"\${$var+set}\"; then ++ relink_command="{ test -z \"\${$var+set}\" || $lt_unset $var || { $var=; export $var; }; }; $relink_command" ++ elif eval var_value=\$$var; test -z "$var_value"; then ++ relink_command="$var=; export $var; $relink_command" ++ else ++ func_quote_for_eval "$var_value" ++ relink_command="$var=$func_quote_for_eval_result; export $var; $relink_command" ++ fi ++ done ++ # Quote the link command for shipping. ++ relink_command="(cd `pwd`; $SHELL $progpath $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)" ++ relink_command=`$ECHO "X$relink_command" | $Xsed -e "$sed_quote_subst"` ++ if test "$hardcode_automatic" = yes ; then ++ relink_command= ++ fi ++ ++ # Only create the output if not a dry run. ++ $opt_dry_run || { ++ for installed in no yes; do ++ if test "$installed" = yes; then ++ if test -z "$install_libdir"; then ++ break ++ fi ++ output="$output_objdir/$outputname"i ++ # Replace all uninstalled libtool libraries with the installed ones ++ newdependency_libs= ++ for deplib in $dependency_libs; do ++ case $deplib in ++ *.la) ++ func_basename "$deplib" ++ name="$func_basename_result" ++ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` ++ test -z "$libdir" && \ ++ func_fatal_error "\`$deplib' is not a valid libtool archive" ++ newdependency_libs="$newdependency_libs $libdir/$name" ++ ;; ++ *) newdependency_libs="$newdependency_libs $deplib" ;; ++ esac ++ done ++ dependency_libs="$newdependency_libs" ++ newdlfiles= ++ ++ for lib in $dlfiles; do ++ case $lib in ++ *.la) ++ func_basename "$lib" ++ name="$func_basename_result" ++ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib` ++ test -z "$libdir" && \ ++ func_fatal_error "\`$lib' is not a valid libtool archive" ++ newdlfiles="$newdlfiles $libdir/$name" ++ ;; ++ *) newdlfiles="$newdlfiles $lib" ;; ++ esac ++ done ++ dlfiles="$newdlfiles" ++ newdlprefiles= ++ for lib in $dlprefiles; do ++ case $lib in ++ *.la) ++ # Only pass preopened files to the pseudo-archive (for ++ # eventual linking with the app. that links it) if we ++ # didn't already link the preopened objects directly into ++ # the library: ++ func_basename "$lib" ++ name="$func_basename_result" ++ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib` ++ test -z "$libdir" && \ ++ func_fatal_error "\`$lib' is not a valid libtool archive" ++ newdlprefiles="$newdlprefiles $libdir/$name" ++ ;; ++ esac ++ done ++ dlprefiles="$newdlprefiles" ++ else ++ newdlfiles= ++ for lib in $dlfiles; do ++ case $lib in ++ [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;; ++ *) abs=`pwd`"/$lib" ;; ++ esac ++ newdlfiles="$newdlfiles $abs" ++ done ++ dlfiles="$newdlfiles" ++ newdlprefiles= ++ for lib in $dlprefiles; do ++ case $lib in ++ [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;; ++ *) abs=`pwd`"/$lib" ;; ++ esac ++ newdlprefiles="$newdlprefiles $abs" ++ done ++ dlprefiles="$newdlprefiles" ++ fi ++ $RM $output ++ # place dlname in correct position for cygwin ++ tdlname=$dlname ++ case $host,$output,$installed,$module,$dlname in ++ *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll | *cegcc*,*lai,yes,no,*.dll) tdlname=../bin/$dlname ;; ++ esac ++ $ECHO > $output "\ ++# $outputname - a libtool library file ++# Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION ++# ++# Please DO NOT delete this file! ++# It is necessary for linking the library. ++ ++# The name that we can dlopen(3). ++dlname='$tdlname' ++ ++# Names of this library. ++library_names='$library_names' ++ ++# The name of the static archive. ++old_library='$old_library' ++ ++# Linker flags that can not go in dependency_libs. ++inherited_linker_flags='$new_inherited_linker_flags' ++ ++# Libraries that this one depends upon. ++dependency_libs='$dependency_libs' ++ ++# Names of additional weak libraries provided by this library ++weak_library_names='$weak_libs' ++ ++# Version information for $libname. ++current=$current ++age=$age ++revision=$revision ++ ++# Is this an already installed library? ++installed=$installed ++ ++# Should we warn about portability when linking against -modules? ++shouldnotlink=$module ++ ++# Files to dlopen/dlpreopen ++dlopen='$dlfiles' ++dlpreopen='$dlprefiles' ++ ++# Directory that this library needs to be installed in: ++libdir='$install_libdir'" ++ if test "$installed" = no && test "$need_relink" = yes; then ++ $ECHO >> $output "\ ++relink_command=\"$relink_command\"" ++ fi ++ done ++ } ++ ++ # Do a symbolic link so that the libtool archive can be found in ++ # LD_LIBRARY_PATH before the program is installed. ++ func_show_eval '( cd "$output_objdir" && $RM "$outputname" && $LN_S "../$outputname" "$outputname" )' 'exit $?' ++ ;; ++ esac ++ exit $EXIT_SUCCESS ++} ++ ++{ test "$mode" = link || test "$mode" = relink; } && ++ func_mode_link ${1+"$@"} ++ ++ ++# func_mode_uninstall arg... ++func_mode_uninstall () ++{ ++ $opt_debug ++ RM="$nonopt" ++ files= ++ rmforce= ++ exit_status=0 ++ ++ # This variable tells wrapper scripts just to set variables rather ++ # than running their programs. ++ libtool_install_magic="$magic" ++ ++ for arg ++ do ++ case $arg in ++ -f) RM="$RM $arg"; rmforce=yes ;; ++ -*) RM="$RM $arg" ;; ++ *) files="$files $arg" ;; ++ esac ++ done ++ ++ test -z "$RM" && \ ++ func_fatal_help "you must specify an RM program" ++ ++ rmdirs= ++ ++ origobjdir="$objdir" ++ for file in $files; do ++ func_dirname "$file" "" "." ++ dir="$func_dirname_result" ++ if test "X$dir" = X.; then ++ objdir="$origobjdir" ++ else ++ objdir="$dir/$origobjdir" ++ fi ++ func_basename "$file" ++ name="$func_basename_result" ++ test "$mode" = uninstall && objdir="$dir" ++ ++ # Remember objdir for removal later, being careful to avoid duplicates ++ if test "$mode" = clean; then ++ case " $rmdirs " in ++ *" $objdir "*) ;; ++ *) rmdirs="$rmdirs $objdir" ;; ++ esac ++ fi ++ ++ # Don't error if the file doesn't exist and rm -f was used. ++ if { test -L "$file"; } >/dev/null 2>&1 || ++ { test -h "$file"; } >/dev/null 2>&1 || ++ test -f "$file"; then ++ : ++ elif test -d "$file"; then ++ exit_status=1 ++ continue ++ elif test "$rmforce" = yes; then ++ continue ++ fi ++ ++ rmfiles="$file" ++ ++ case $name in ++ *.la) ++ # Possibly a libtool archive, so verify it. ++ if func_lalib_p "$file"; then ++ func_source $dir/$name ++ ++ # Delete the libtool libraries and symlinks. ++ for n in $library_names; do ++ rmfiles="$rmfiles $objdir/$n" ++ done ++ test -n "$old_library" && rmfiles="$rmfiles $objdir/$old_library" ++ ++ case "$mode" in ++ clean) ++ case " $library_names " in ++ # " " in the beginning catches empty $dlname ++ *" $dlname "*) ;; ++ *) rmfiles="$rmfiles $objdir/$dlname" ;; ++ esac ++ test -n "$libdir" && rmfiles="$rmfiles $objdir/$name $objdir/${name}i" ++ ;; ++ uninstall) ++ if test -n "$library_names"; then ++ # Do each command in the postuninstall commands. ++ func_execute_cmds "$postuninstall_cmds" 'test "$rmforce" = yes || exit_status=1' ++ fi ++ ++ if test -n "$old_library"; then ++ # Do each command in the old_postuninstall commands. ++ func_execute_cmds "$old_postuninstall_cmds" 'test "$rmforce" = yes || exit_status=1' ++ fi ++ # FIXME: should reinstall the best remaining shared library. ++ ;; ++ esac ++ fi ++ ;; ++ ++ *.lo) ++ # Possibly a libtool object, so verify it. ++ if func_lalib_p "$file"; then ++ ++ # Read the .lo file ++ func_source $dir/$name ++ ++ # Add PIC object to the list of files to remove. ++ if test -n "$pic_object" && ++ test "$pic_object" != none; then ++ rmfiles="$rmfiles $dir/$pic_object" ++ fi ++ ++ # Add non-PIC object to the list of files to remove. ++ if test -n "$non_pic_object" && ++ test "$non_pic_object" != none; then ++ rmfiles="$rmfiles $dir/$non_pic_object" ++ fi ++ fi ++ ;; ++ ++ *) ++ if test "$mode" = clean ; then ++ noexename=$name ++ case $file in ++ *.exe) ++ func_stripname '' '.exe' "$file" ++ file=$func_stripname_result ++ func_stripname '' '.exe' "$name" ++ noexename=$func_stripname_result ++ # $file with .exe has already been added to rmfiles, ++ # add $file without .exe ++ rmfiles="$rmfiles $file" ++ ;; ++ esac ++ # Do a test to see if this is a libtool program. ++ if func_ltwrapper_p "$file"; then ++ if func_ltwrapper_executable_p "$file"; then ++ func_ltwrapper_scriptname "$file" ++ relink_command= ++ func_source $func_ltwrapper_scriptname_result ++ rmfiles="$rmfiles $func_ltwrapper_scriptname_result" ++ else ++ relink_command= ++ func_source $dir/$noexename ++ fi ++ ++ # note $name still contains .exe if it was in $file originally ++ # as does the version of $file that was added into $rmfiles ++ rmfiles="$rmfiles $objdir/$name $objdir/${name}S.${objext}" ++ if test "$fast_install" = yes && test -n "$relink_command"; then ++ rmfiles="$rmfiles $objdir/lt-$name" ++ fi ++ if test "X$noexename" != "X$name" ; then ++ rmfiles="$rmfiles $objdir/lt-${noexename}.c" ++ fi ++ fi ++ fi ++ ;; ++ esac ++ func_show_eval "$RM $rmfiles" 'exit_status=1' ++ done ++ objdir="$origobjdir" ++ ++ # Try to remove the ${objdir}s in the directories where we deleted files ++ for dir in $rmdirs; do ++ if test -d "$dir"; then ++ func_show_eval "rmdir $dir >/dev/null 2>&1" ++ fi ++ done ++ ++ exit $exit_status ++} ++ ++{ test "$mode" = uninstall || test "$mode" = clean; } && ++ func_mode_uninstall ${1+"$@"} ++ ++test -z "$mode" && { ++ help="$generic_help" ++ func_fatal_help "you must specify a MODE" ++} ++ ++test -z "$exec_cmd" && \ ++ func_fatal_help "invalid operation mode \`$mode'" ++ ++if test -n "$exec_cmd"; then ++ eval exec "$exec_cmd" ++ exit $EXIT_FAILURE ++fi ++ ++exit $exit_status ++ ++ ++# The TAGs below are defined such that we never get into a situation ++# in which we disable both kinds of libraries. Given conflicting ++# choices, we go for a static library, that is the most portable, ++# since we can't tell whether shared libraries were disabled because ++# the user asked for that or because the platform doesn't support ++# them. This is particularly important on AIX, because we don't ++# support having both static and shared libraries enabled at the same ++# time on that platform, so we default to a shared-only configuration. ++# If a disable-shared tag is given, we'll fallback to a static-only ++# configuration. But we'll never go from static-only to shared-only. ++ ++# ### BEGIN LIBTOOL TAG CONFIG: disable-shared ++build_libtool_libs=no ++build_old_libs=yes ++# ### END LIBTOOL TAG CONFIG: disable-shared ++ ++# ### BEGIN LIBTOOL TAG CONFIG: disable-static ++build_old_libs=`case $build_libtool_libs in yes) echo no;; *) echo yes;; esac` ++# ### END LIBTOOL TAG CONFIG: disable-static ++ ++# Local Variables: ++# mode:shell-script ++# sh-indentation:2 ++# End: ++# vi:sw=2 ++ diff --git a/package/uclibc++/Config.in.manual b/package/uclibc++/Config.in.manual index 50729fcaa..b645e03a4 100644 --- a/package/uclibc++/Config.in.manual +++ b/package/uclibc++/Config.in.manual @@ -1,7 +1,11 @@ +comment "uClibc++... C++ library for embedded systems (disabled, c++ missing)" +depends on !ADK_TOOLCHAIN_GCC_CXX + config ADK_PACKAGE_UCLIBCXX prompt "uClibc++............... C++ library for embedded systems" tristate depends on ADK_TARGET_LIB_UCLIBC + depends on ADK_TOOLCHAIN_GCC_CXX default n help A standard C++ library for embedded systems diff --git a/package/uclibc++/Makefile b/package/uclibc++/Makefile index 760258bdd..e718b20bc 100644 --- a/package/uclibc++/Makefile +++ b/package/uclibc++/Makefile @@ -11,6 +11,7 @@ PKG_DESCR:= A standard c++ library for embedded systems PKG_SECTION:= libs PKG_URL:= http://cxx.uclibc.org/ PKG_SITES:= http://cxx.uclibc.org/src/ +PKG_NEED_CXX:= 1 DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 diff --git a/package/uclibc/Makefile b/package/uclibc/Makefile index 5538cdfbd..90b9f49f9 100644 --- a/package/uclibc/Makefile +++ b/package/uclibc/Makefile @@ -23,17 +23,16 @@ 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) || \ grep $(ADK_RUNTIME_TIMEZONE) ./files/tz.lst | \ cut -f 2 > $(IDIR_UCLIBC)/etc/TZ +ifeq ($(ADK_TOOLCHAIN_GCC_USE_SSP),y) + $(CP) $(STAGING_TARGET_DIR)/lib/libssp.so* $(IDIR_UCLIBC)/lib/ +endif $(CP) $(STAGING_TARGET_DIR)/lib/libc.so* $(IDIR_UCLIBC)/lib/ $(CP) $(STAGING_TARGET_DIR)/lib/libuClibc-$(PKG_VERSION).so \ $(IDIR_UCLIBC)/lib/ 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/ulogd/patches/patch-ltmain_sh b/package/ulogd/patches/patch-ltmain_sh new file mode 100644 index 000000000..d5b6fafd8 --- /dev/null +++ b/package/ulogd/patches/patch-ltmain_sh @@ -0,0 +1,11 @@ +--- ulogd-2.0.0beta4.orig/ltmain.sh 2010-07-16 17:53:39.000000000 +0200 ++++ ulogd-2.0.0beta4/ltmain.sh 2011-01-17 16:15:25.000000000 +0100 +@@ -4765,7 +4765,7 @@ func_mode_link () + # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC + # @file GCC response files + -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) + func_quote_for_eval "$arg" + arg="$func_quote_for_eval_result" + func_append compile_command " $arg" diff --git a/package/updatedd/patches/patch-ltmain_sh b/package/updatedd/patches/patch-ltmain_sh new file mode 100644 index 000000000..3b4dffb54 --- /dev/null +++ b/package/updatedd/patches/patch-ltmain_sh @@ -0,0 +1,11 @@ +--- updatedd-2.6.orig/ltmain.sh 2006-09-07 22:32:59.000000000 +0200 ++++ updatedd-2.6/ltmain.sh 2011-01-17 16:20:16.000000000 +0100 +@@ -1623,7 +1623,7 @@ EOF + # -pg pass through profiling flag for GCC + # @file GCC response files + -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*|-pg| \ +- -t[45]*|-txscale*|@*) ++ -t[45]*|-txscale*|@*|-fstack-protector*|-flto) + + # Unknown arguments in both finalize_command and compile_command need + # to be aesthetically quoted because they are evaled later. diff --git a/package/util-linux-ng/patches/patch-config_ltmain_sh b/package/util-linux-ng/patches/patch-config_ltmain_sh new file mode 100644 index 000000000..86ee09448 --- /dev/null +++ b/package/util-linux-ng/patches/patch-config_ltmain_sh @@ -0,0 +1,11 @@ +--- util-linux-ng-2.18.orig/config/ltmain.sh 2010-02-04 12:53:55.000000000 +0100 ++++ util-linux-ng-2.18/config/ltmain.sh 2011-01-17 16:27:39.000000000 +0100 +@@ -4765,7 +4765,7 @@ func_mode_link () + # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC + # @file GCC response files + -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) + func_quote_for_eval "$arg" + arg="$func_quote_for_eval_result" + func_append compile_command " $arg" diff --git a/package/valgrind/patches/patch-auxprogs_valgrind-listener_c b/package/valgrind/patches/patch-auxprogs_valgrind-listener_c new file mode 100644 index 000000000..be4b433ed --- /dev/null +++ b/package/valgrind/patches/patch-auxprogs_valgrind-listener_c @@ -0,0 +1,29 @@ + try to avoid problems with a pre #defined st_atime here, too +--- valgrind-3.5.0.orig/auxprogs/valgrind-listener.c 2009-08-19 15:37:30.000000000 +0200 ++++ valgrind-3.5.0/auxprogs/valgrind-listener.c 2010-12-30 17:23:49.807262269 +0100 +@@ -32,6 +32,12 @@ + + /*---------------------------------------------------------------*/ + ++#include "pub_core_basics.h" ++#include "pub_core_libcassert.h" // For VG_BUGS_TO ++#include "pub_core_vki.h" // Avoids warnings from ++ // pub_core_libcfile.h ++#include "pub_core_libcfile.h" // For VG_CLO_DEFAULT_LOGPORT ++ + #include <stdio.h> + #include <unistd.h> + #include <string.h> +@@ -44,12 +50,6 @@ + #include <sys/socket.h> + #include <netinet/in.h> + +-#include "pub_core_basics.h" +-#include "pub_core_libcassert.h" // For VG_BUGS_TO +-#include "pub_core_vki.h" // Avoids warnings from +- // pub_core_libcfile.h +-#include "pub_core_libcfile.h" // For VG_CLO_DEFAULT_LOGPORT +- + + /*---------------------------------------------------------------*/ + diff --git a/package/valgrind/patches/patch-coregrind_launcher-linux_c b/package/valgrind/patches/patch-coregrind_launcher-linux_c new file mode 100644 index 000000000..e94ffd908 --- /dev/null +++ b/package/valgrind/patches/patch-coregrind_launcher-linux_c @@ -0,0 +1,29 @@ + try to avoid errors regarding already #defined st_atime in bits/stat.h or so +--- valgrind-3.5.0.orig/coregrind/launcher-linux.c 2009-08-19 15:37:47.000000000 +0200 ++++ valgrind-3.5.0/coregrind/launcher-linux.c 2010-12-30 17:08:00.035938916 +0100 +@@ -32,6 +32,12 @@ + and so it doesn't have to conform to Valgrind's arcane rules on + no-glibc-usage etc. */ + ++#include "pub_core_debuglog.h" ++#include "pub_core_vki.h" // Avoids warnings from ++ // pub_core_libcfile.h ++#include "pub_core_libcproc.h" // For VALGRIND_LIB, VALGRIND_LAUNCHER ++#include "pub_core_ume.h" ++ + #include <assert.h> + #include <ctype.h> + #include <elf.h> +@@ -45,12 +51,6 @@ + #include <sys/user.h> + #include <unistd.h> + +-#include "pub_core_debuglog.h" +-#include "pub_core_vki.h" // Avoids warnings from +- // pub_core_libcfile.h +-#include "pub_core_libcproc.h" // For VALGRIND_LIB, VALGRIND_LAUNCHER +-#include "pub_core_ume.h" +- + + + #define PATH_MAX 4096 /* POSIX refers to this a lot but I dunno diff --git a/package/vrrpd/patches/patch-Makefile b/package/vrrpd/patches/patch-Makefile new file mode 100644 index 000000000..4a628b744 --- /dev/null +++ b/package/vrrpd/patches/patch-Makefile @@ -0,0 +1,17 @@ +--- vrrpd-1.0.orig/Makefile 2002-09-09 16:51:13.000000000 +0200 ++++ vrrpd-1.0/Makefile 2011-01-17 16:36:32.000000000 +0100 +@@ -14,12 +14,10 @@ DBG_OPT=-g + #LINKLIB = -lpcap + COMMON_CFLAGS= $(MAIN_OPT) $(INCLUDEOPT) $(PROF_OPT) $(DBG_OPT) $(MACHINEOPT) + +-# set to compile with GCC +-CC=gcc +-CFLAGS= $(COMMON_CFLAGS) -Wall ++CFLAGS?= $(COMMON_CFLAGS) -Wall + + vrrpd : $(VRRPD_OBJS) +- $(CC) $(PROF_OPT) -o $@ $(VRRPD_OBJS) $(LINKLIB) ++ $(CC) $(LDFLAGS) -o $@ $(VRRPD_OBJS) $(LINKLIB) + + vrrpd.o: vrrpd.h + libnetlink.o: libnetlink.h diff --git a/package/watchdog/Makefile b/package/watchdog/Makefile index b2c4839f7..ab8f5c570 100644 --- a/package/watchdog/Makefile +++ b/package/watchdog/Makefile @@ -18,7 +18,7 @@ $(eval $(call PKG_template,WATCHDOG,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${ post-install: ${INSTALL_DIR} ${IDIR_WATCHDOG}/sbin ${IDIR_WATCHDOG}/etc/ ${INSTALL_DATA} ./files/watchdog.conf ${IDIR_WATCHDOG}/etc/ - ${INSTALL_BIN} ${WRKINST}/sbin/watchdog \ + ${INSTALL_BIN} ${WRKINST}/usr/sbin/watchdog \ ${IDIR_WATCHDOG}/sbin/ include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/weechat/patches/patch-ltmain_sh b/package/weechat/patches/patch-ltmain_sh new file mode 100644 index 000000000..33915daef --- /dev/null +++ b/package/weechat/patches/patch-ltmain_sh @@ -0,0 +1,11 @@ +--- weechat-0.3.2.orig/ltmain.sh 2010-04-17 11:39:59.000000000 +0200 ++++ weechat-0.3.2/ltmain.sh 2011-01-17 16:44:00.000000000 +0100 +@@ -4765,7 +4765,7 @@ func_mode_link () + # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC + # @file GCC response files + -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) + func_quote_for_eval "$arg" + arg="$func_quote_for_eval_result" + func_append compile_command " $arg" diff --git a/package/wget/Makefile b/package/wget/Makefile index 6629e12b3..e2ff151f4 100644 --- a/package/wget/Makefile +++ b/package/wget/Makefile @@ -17,7 +17,8 @@ include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,WGET,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) post-install: - ${INSTALL_DIR} ${IDIR_WGET}/usr/bin + ${INSTALL_DIR} ${IDIR_WGET}/etc ${IDIR_WGET}/usr/bin + ${INSTALL_DATA} ${WRKINST}/etc/wgetrc ${IDIR_WGET}/etc/ ${INSTALL_BIN} ${WRKINST}/usr/bin/wget ${IDIR_WGET}/usr/bin include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/wget/files/wget.conffiles b/package/wget/files/wget.conffiles new file mode 100644 index 000000000..fc52bd1a2 --- /dev/null +++ b/package/wget/files/wget.conffiles @@ -0,0 +1 @@ +/etc/wgetrc diff --git a/package/wifidog/patches/patch-config_ltmain_sh b/package/wifidog/patches/patch-config_ltmain_sh new file mode 100644 index 000000000..e2624965b --- /dev/null +++ b/package/wifidog/patches/patch-config_ltmain_sh @@ -0,0 +1,11 @@ +--- wifidog-1.1.5.orig/config/ltmain.sh 2007-08-14 19:43:36.000000000 +0200 ++++ wifidog-1.1.5/config/ltmain.sh 2011-01-17 16:54:21.000000000 +0100 +@@ -1663,7 +1663,7 @@ EOF + # -F/path gives path to uninstalled frameworks, gcc on darwin + # @file GCC response files + -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) + + # Unknown arguments in both finalize_command and compile_command need + # to be aesthetically quoted because they are evaled later. diff --git a/package/wireless-tools/patches/patch-Makefile b/package/wireless-tools/patches/patch-Makefile new file mode 100644 index 000000000..e3dcf4af8 --- /dev/null +++ b/package/wireless-tools/patches/patch-Makefile @@ -0,0 +1,11 @@ +--- wireless_tools.29.orig/Makefile 2007-09-18 01:56:46.000000000 +0200 ++++ wireless_tools.29/Makefile 2011-01-17 16:59:21.000000000 +0100 +@@ -145,7 +145,7 @@ wireless.h: + + # Compilation of the dynamic library + $(DYNAMIC): $(OBJS:.o=.so) +- $(CC) -shared -o $@ -Wl,-soname,$@ $(STRIPFLAGS) $(LIBS) -lc $^ ++ $(CC) $(LDFLAGS) -shared -o $@ -Wl,-soname,$@ $(STRIPFLAGS) $(LIBS) -lc $^ + + # Compilation of the static library + $(STATIC): $(OBJS:.o=.so) diff --git a/package/wpa_supplicant/Makefile b/package/wpa_supplicant/Makefile index 7b8be1a0c..aebb85f8d 100644 --- a/package/wpa_supplicant/Makefile +++ b/package/wpa_supplicant/Makefile @@ -4,26 +4,27 @@ 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 WRKSRC= ${WRKDIST}/${PKG_NAME} -PKG_CHOICES:= WITH_OPENSSL WITH_GNUTLS -PKGCD_WITH_OPENSSL:= use OpenSSL for crypto -PKGCS_WITH_OPENSSL:= libopenssl -PKGCB_WITH_OPENSSL:= openssl -PKGCD_WITH_GNUTLS:= use GnuTLS for crypto -PKGCS_WITH_GNUTLS:= libgnutls -PKGCB_WITH_GNUTLS:= gnutls +PKG_CHOICES_WPA_SUPPLICANT:= WITH_OPENSSL WITH_GNUTLS +PKGCD_WITH_OPENSSL:= use OpenSSL for crypto +PKGCS_WITH_OPENSSL:= libopenssl +PKGCB_WITH_OPENSSL:= openssl +PKGCD_WITH_GNUTLS:= use GnuTLS for crypto +PKGCS_WITH_GNUTLS:= libgnutls +PKGCB_WITH_GNUTLS:= gnutls include ${TOPDIR}/mk/package.mk @@ -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/wput/patches/patch-Makefile b/package/wput/patches/patch-Makefile deleted file mode 100644 index a4b70f58c..000000000 --- a/package/wput/patches/patch-Makefile +++ /dev/null @@ -1,21 +0,0 @@ ---- wput-0.6.1.orig/Makefile 2007-12-12 18:30:04.000000000 +0100 -+++ wput-0.6.1/Makefile 2010-02-06 04:45:45.273084356 +0100 -@@ -1,6 +1,6 @@ - #wput makefile - PACKAGE = wput --prefix = /usr/local -+prefix = /usr - datadir = $(prefix)/share - mandir = $(datadir)/man/man1 - exec_prefix = ${prefix} -@@ -16,8 +16,8 @@ win-clean: - - install: all - cd po && $(MAKE) $(MAKEDEFS) $@ -- install -m0755 wput $(bindir) -- install -m0644 doc/wput.1.gz $(mandir) -+ install -m0755 wput $(DESTDIR)$(bindir) -+ install -m0644 doc/wput.1.gz $(DESTDIR)$(mandir) - @echo "----------------" - @echo "Wput installed. See 'wput -h' or 'man wput' for usage information." - @echo "Further documentation is located in the doc/USAGE.* files." diff --git a/package/wput/patches/patch-config_status b/package/wput/patches/patch-config_status deleted file mode 100644 index 176dcb666..000000000 --- a/package/wput/patches/patch-config_status +++ /dev/null @@ -1,160 +0,0 @@ ---- wput-0.6.1.orig/config.status 2007-12-12 18:30:04.000000000 +0100 -+++ wput-0.6.1/config.status 2010-02-06 04:45:45.083075667 +0100 -@@ -334,14 +334,14 @@ Report bugs to <bug-autoconf@gnu.org>." - - ac_cs_version="\ - wput config.status 0.6 --configured by ./configure, generated by GNU Autoconf 2.61, -- with options \"\" -+configured by /home/wbx/openadk/build_qemu-x86_uclibc/w-wput-0.6.1-1/wput-0.6.1/configure, generated by GNU Autoconf 2.61, -+ with options \"'--build=x86_64-linux-gnu' '--host=i586-linux' '--target=i586-linux' '--program-prefix=' '--program-suffix=' '--prefix=/usr' '--datadir=/usr/share' '--mandir=/usr/share/man' '--libexecdir=/usr/sbin' '--localstatedir=/var' '--sysconfdir=/etc' '--disable-nls' '--enable-shared' '--enable-static' '--disable-dependency-tracking' '--disable-libtool-lock' '--disable-debug' '--disable-g-switch' 'build_alias=x86_64-linux-gnu' 'host_alias=i586-linux' 'target_alias=i586-linux' 'CC=/home/wbx/openadk/cross_qemu-x86_uclibc/host/bin/i586-linux-uclibc-gcc' 'CFLAGS=-fno-ident -Os -pipe -march=i586 -fomit-frame-pointer' 'LDFLAGS=-Wl,-O2 -Wl,-rpath -Wl,/usr/lib -Wl,-rpath-link -Wl,/home/wbx/openadk/cross_qemu-x86_uclibc/target/usr/lib -L/home/wbx/openadk/cross_qemu-x86_uclibc/target/lib -L/home/wbx/openadk/cross_qemu-x86_uclibc/target/usr/lib' 'CPPFLAGS=-I/home/wbx/openadk/cross_qemu-x86_uclibc/target/usr/include -DNDEBUG'\" - - Copyright (C) 2006 Free Software Foundation, Inc. - This config.status script is free software; the Free Software Foundation - gives unlimited permission to copy, distribute and modify it." - --ac_pwd='/home/hagen/studium/projects/wput' -+ac_pwd='/home/wbx/openadk/build_qemu-x86_uclibc/w-wput-0.6.1-1/wput-0.6.1' - srcdir='.' - INSTALL='/usr/bin/install -c' - # If no file are specified by the user, then we need to provide default -@@ -409,10 +409,10 @@ if $ac_cs_silent; then - fi - - if $ac_cs_recheck; then -- echo "running CONFIG_SHELL=/bin/bash /bin/bash ./configure " $ac_configure_extra_args " --no-create --no-recursion" >&6 -+ echo "running CONFIG_SHELL=/bin/bash /bin/bash /home/wbx/openadk/build_qemu-x86_uclibc/w-wput-0.6.1-1/wput-0.6.1/configure " '--build=x86_64-linux-gnu' '--host=i586-linux' '--target=i586-linux' '--program-prefix=' '--program-suffix=' '--prefix=/usr' '--datadir=/usr/share' '--mandir=/usr/share/man' '--libexecdir=/usr/sbin' '--localstatedir=/var' '--sysconfdir=/etc' '--disable-nls' '--enable-shared' '--enable-static' '--disable-dependency-tracking' '--disable-libtool-lock' '--disable-debug' '--disable-g-switch' 'build_alias=x86_64-linux-gnu' 'host_alias=i586-linux' 'target_alias=i586-linux' 'CC=/home/wbx/openadk/cross_qemu-x86_uclibc/host/bin/i586-linux-uclibc-gcc' 'CFLAGS=-fno-ident -Os -pipe -march=i586 -fomit-frame-pointer' 'LDFLAGS=-Wl,-O2 -Wl,-rpath -Wl,/usr/lib -Wl,-rpath-link -Wl,/home/wbx/openadk/cross_qemu-x86_uclibc/target/usr/lib -L/home/wbx/openadk/cross_qemu-x86_uclibc/target/lib -L/home/wbx/openadk/cross_qemu-x86_uclibc/target/usr/lib' 'CPPFLAGS=-I/home/wbx/openadk/cross_qemu-x86_uclibc/target/usr/include -DNDEBUG' $ac_configure_extra_args " --no-create --no-recursion" >&6 - CONFIG_SHELL=/bin/bash - export CONFIG_SHELL -- exec /bin/bash "./configure" $ac_configure_extra_args --no-create --no-recursion -+ exec /bin/bash "/home/wbx/openadk/build_qemu-x86_uclibc/w-wput-0.6.1-1/wput-0.6.1/configure" '--build=x86_64-linux-gnu' '--host=i586-linux' '--target=i586-linux' '--program-prefix=' '--program-suffix=' '--prefix=/usr' '--datadir=/usr/share' '--mandir=/usr/share/man' '--libexecdir=/usr/sbin' '--localstatedir=/var' '--sysconfdir=/etc' '--disable-nls' '--enable-shared' '--enable-static' '--disable-dependency-tracking' '--disable-libtool-lock' '--disable-debug' '--disable-g-switch' 'build_alias=x86_64-linux-gnu' 'host_alias=i586-linux' 'target_alias=i586-linux' 'CC=/home/wbx/openadk/cross_qemu-x86_uclibc/host/bin/i586-linux-uclibc-gcc' 'CFLAGS=-fno-ident -Os -pipe -march=i586 -fomit-frame-pointer' 'LDFLAGS=-Wl,-O2 -Wl,-rpath -Wl,/usr/lib -Wl,-rpath-link -Wl,/home/wbx/openadk/cross_qemu-x86_uclibc/target/usr/lib -L/home/wbx/openadk/cross_qemu-x86_uclibc/target/lib -L/home/wbx/openadk/cross_qemu-x86_uclibc/target/usr/lib' 'CPPFLAGS=-I/home/wbx/openadk/cross_qemu-x86_uclibc/target/usr/include -DNDEBUG' $ac_configure_extra_args --no-create --no-recursion - fi - - exec 5>>config.log -@@ -510,16 +510,16 @@ s,@PACKAGE_VERSION@,|#_!!_#|0.6,g - s,@PACKAGE_STRING@,|#_!!_#|wput 0.6,g - s,@PACKAGE_BUGREPORT@,|#_!!_#|,g - s,@exec_prefix@,|#_!!_#|${prefix},g --s,@prefix@,|#_!!_#|/usr/local,g -+s,@prefix@,|#_!!_#|/usr,g - s,@program_transform_name@,|#_!!_#|s\,x\,x\,,g - s,@bindir@,|#_!!_#|${exec_prefix}/bin,g - s,@sbindir@,|#_!!_#|${exec_prefix}/sbin,g --s,@libexecdir@,|#_!!_#|${exec_prefix}/libexec,g -+s,@libexecdir@,|#_!!_#|/usr/sbin,g - s,@datarootdir@,|#_!!_#|${prefix}/share,g --s,@datadir@,|#_!!_#|${datarootdir},g --s,@sysconfdir@,|#_!!_#|${prefix}/etc,g -+s,@datadir@,|#_!!_#|/usr/share,g -+s,@sysconfdir@,|#_!!_#|/etc,g - s,@sharedstatedir@,|#_!!_#|${prefix}/com,g --s,@localstatedir@,|#_!!_#|${prefix}/var,g -+s,@localstatedir@,|#_!!_#|/var,g - s,@includedir@,|#_!!_#|${prefix}/include,g - s,@oldincludedir@,|#_!!_#|/usr/include,g - s,@docdir@,|#_!!_#|${datarootdir}/doc/${PACKAGE_TARNAME},g -@@ -530,25 +530,25 @@ s,@pdfdir@,|#_!!_#|${docdir},g - s,@psdir@,|#_!!_#|${docdir},g - s,@libdir@,|#_!!_#|${exec_prefix}/lib,g - s,@localedir@,|#_!!_#|${datarootdir}/locale,g --s,@mandir@,|#_!!_#|${datarootdir}/man,g -+s,@mandir@,|#_!!_#|/usr/share/man,g - s,@DEFS@,|#_!!_#|-DHAVE_CONFIG_H,g - s,@ECHO_C@,|#_!!_#|,g - s,@ECHO_N@,|#_!!_#|-n,g - s,@ECHO_T@,|#_!!_#|,g - s,@LIBS@,|#_!!_#|,g --s,@build_alias@,|#_!!_#|,g --s,@host_alias@,|#_!!_#|,g --s,@target_alias@,|#_!!_#|,g -+s,@build_alias@,|#_!!_#|x86_64-linux-gnu,g -+s,@host_alias@,|#_!!_#|i586-linux,g -+s,@target_alias@,|#_!!_#|i586-linux,g - s,@PACKAGE@,|#_!!_#|wput,g - s,@VERSION@,|#_!!_#|0.6,g --s,@CC@,|#_!!_#|gcc,g --s,@CFLAGS@,|#_!!_#| -Wall -g,g --s,@LDFLAGS@,|#_!!_#|,g --s,@CPPFLAGS@,|#_!!_#|,g --s,@ac_ct_CC@,|#_!!_#|gcc,g -+s,@CC@,|#_!!_#|/home/wbx/openadk/cross_qemu-x86_uclibc/host/bin/i586-linux-uclibc-gcc,g -+s,@CFLAGS@,|#_!!_#|-fno-ident -Os -pipe -march=i586 -fomit-frame-pointer -Wall,g -+s,@LDFLAGS@,|#_!!_#|-Wl\,-O2 -Wl\,-rpath -Wl\,/usr/lib -Wl\,-rpath-link -Wl\,/home/wbx/openadk/cross_qemu-x86_uclibc/target/usr/lib -L/home/wbx/openadk/cross_qemu-x86_uclibc/target/lib -L/home/wbx/openadk/cross_qemu-x86_uclibc/target/usr/lib,g -+s,@CPPFLAGS@,|#_!!_#|-I/home/wbx/openadk/cross_qemu-x86_uclibc/target/usr/include -DNDEBUG,g -+s,@ac_ct_CC@,|#_!!_#|,g - s,@EXEEXT@,|#_!!_#|,g - s,@OBJEXT@,|#_!!_#|o,g --s,@CPP@,|#_!!_#|gcc -E,g -+s,@CPP@,|#_!!_#|/home/wbx/openadk/cross_qemu-x86_uclibc/host/bin/i586-linux-uclibc-gcc -E,g - s,@GREP@,|#_!!_#|/bin/grep,g - s,@EGREP@,|#_!!_#|/bin/grep -E,g - s,@SET_MAKE@,|#_!!_#|,g -@@ -556,29 +556,29 @@ s,@INSTALL_PROGRAM@,|#_!!_#|${INSTALL},g - s,@INSTALL_SCRIPT@,|#_!!_#|${INSTALL},g - s,@INSTALL_DATA@,|#_!!_#|${INSTALL} -m 644,g - s,@MKINSTALLDIRS@,|#_!!_#|$(top_builddir)/./mkinstalldirs,g --s,@USE_NLS@,|#_!!_#|yes,g -+s,@USE_NLS@,|#_!!_#|no,g - s,@MSGFMT@,|#_!!_#|/usr/bin/msgfmt,g - s,@GMSGFMT@,|#_!!_#|/usr/bin/msgfmt,g - s,@XGETTEXT@,|#_!!_#|/usr/bin/xgettext,g - s,@MSGMERGE@,|#_!!_#|/usr/bin/msgmerge,g --s,@build@,|#_!!_#|i686-pc-linux-gnu,g --s,@build_cpu@,|#_!!_#|i686,g -+s,@build@,|#_!!_#|x86_64-pc-linux-gnu,g -+s,@build_cpu@,|#_!!_#|x86_64,g - s,@build_vendor@,|#_!!_#|pc,g - s,@build_os@,|#_!!_#|linux-gnu,g --s,@host@,|#_!!_#|i686-pc-linux-gnu,g --s,@host_cpu@,|#_!!_#|i686,g -+s,@host@,|#_!!_#|i586-pc-linux-gnu,g -+s,@host_cpu@,|#_!!_#|i586,g - s,@host_vendor@,|#_!!_#|pc,g - s,@host_os@,|#_!!_#|Linux,g --s,@LIBICONV@,|#_!!_#|-liconv,g --s,@LTLIBICONV@,|#_!!_#|-liconv,g -+s,@LIBICONV@,|#_!!_#|/home/wbx/openadk/cross_qemu-x86_uclibc/target/usr/lib/libiconv.so -Wl\,-rpath -Wl\,/home/wbx/openadk/cross_qemu-x86_uclibc/target/usr/lib,g -+s,@LTLIBICONV@,|#_!!_#|-L/home/wbx/openadk/cross_qemu-x86_uclibc/target/usr/lib -liconv -R/home/wbx/openadk/cross_qemu-x86_uclibc/target/usr/lib,g - s,@INTLLIBS@,|#_!!_#|,g - s,@LIBINTL@,|#_!!_#|,g - s,@LTLIBINTL@,|#_!!_#|,g --s,@POSUB@,|#_!!_#|po,g -+s,@POSUB@,|#_!!_#|,g - s,@GETOPT@,|#_!!_#|,g - s,@MEMDBG@,|#_!!_#|,g --s,@GNUTLS_CFLAGS@,|#_!!_#|-INONE/include,g --s,@GNUTLS_LIBS@,|#_!!_#| -lgnutls-openssl,g -+s,@GNUTLS_CFLAGS@,|#_!!_#|,g -+s,@GNUTLS_LIBS@,|#_!!_#|,g - s,@LIBOBJS@,|#_!!_#|,g - s,@LTLIBOBJS@,|#_!!_#|,g - :end -@@ -776,11 +776,11 @@ case `sed -n '/datarootdir/ { - { echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5 - echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;} - ac_datarootdir_hack=' -- s&@datadir@&${datarootdir}&g -+ s&@datadir@&/usr/share&g - s&@docdir@&${datarootdir}/doc/${PACKAGE_TARNAME}&g - s&@infodir@&${datarootdir}/info&g - s&@localedir@&${datarootdir}/locale&g -- s&@mandir@&${datarootdir}/man&g -+ s&@mandir@&/usr/share/man&g - s&\${datarootdir}&${prefix}/share&g' ;; - esac - sed "/^[ ]*VPATH[ ]*=/{ -@@ -852,14 +852,7 @@ s,^\([ #]*\)[^ ]*\([ ]*HAVE_IOCTL\)[ - s,^\([ #]*\)[^ ]*\([ ]*HAVE_TERMIO_H\)[ (].*,\1define\2 1 , - s,^\([ #]*\)[^ ]*\([ ]*HAVE_TERMIO\)[ (].*,\1define\2 1 , - s,^\([ #]*\)[^ ]*\([ ]*HAVE_LOCALE_H\)[ (].*,\1define\2 1 , --s,^\([ #]*\)[^ ]*\([ ]*HAVE_LIBINTL_H\)[ (].*,\1define\2 1 , - s,^\([ #]*\)[^ ]*\([ ]*HAVE_GETOPT_H\)[ (].*,\1define\2 1 , --s,^\([ #]*\)[^ ]*\([ ]*ENABLE_NLS\)[ (].*,\1define\2 1 , --s,^\([ #]*\)[^ ]*\([ ]*HAVE_GETTEXT\)[ (].*,\1define\2 1 , --s,^\([ #]*\)[^ ]*\([ ]*HAVE_DCGETTEXT\)[ (].*,\1define\2 1 , --s,^\([ #]*\)[^ ]*\([ ]*HAVE_GNUTLS_OPENSSL_H\)[ (].*,\1define\2 1 , --s,^\([ #]*\)[^ ]*\([ ]*HAVE_GNUTLS\)[ (].*,\1define\2 1 , --s,^\([ #]*\)[^ ]*\([ ]*HAVE_SSL\)[ (].*,\1define\2 1 , - s,^\([ #]*\)[^ ]*\([ ]*HAVE_LONG_LONG\)[ (].*,\1define\2 1 , - s,^\([ #]*\)[^ ]*\([ ]*HAVE_UNSIGNED_LONG_LONG\)[ (].*,\1define\2 1 , - s,^\([ #]*\)[^ ]*\([ ]*HAVE_LONG_LONG\)[ (].*,\1define\2 1 , diff --git a/package/wput/patches/patch-po_Makefile b/package/wput/patches/patch-po_Makefile deleted file mode 100644 index f636bff65..000000000 --- a/package/wput/patches/patch-po_Makefile +++ /dev/null @@ -1,50 +0,0 @@ ---- wput-0.6.1.orig/po/Makefile 2007-12-12 18:30:04.000000000 +0100 -+++ wput-0.6.1/po/Makefile 2010-02-06 04:45:45.653081691 +0100 -@@ -20,9 +20,9 @@ srcdir = . - top_srcdir = .. - - --prefix = /usr/local -+prefix = /usr - exec_prefix = ${prefix} --datadir = ${prefix}/share -+datadir = /usr/share - localedir = $(datadir)/locale - gettextsrcdir = $(datadir)/gettext/po - -@@ -124,7 +124,7 @@ EXTRA_LOCALE_CATEGORIES = - mv t-$@ $@ - - --all: all-yes -+all: all-no - - all-yes: stamp-po - all-no: -@@ -191,7 +191,7 @@ $(POFILES): $(srcdir)/$(DOMAIN).pot - - install: install-exec install-data - install-exec: --install-data: install-data-yes -+install-data: install-data-no - if test "$(PACKAGE)" = "gettext-tools"; then \ - $(mkinstalldirs) $(DESTDIR)$(gettextsrcdir); \ - for file in $(DISTFILES.common) Makevars.template; do \ -@@ -250,7 +250,7 @@ install-strip: install - - installdirs: installdirs-exec installdirs-data - installdirs-exec: --installdirs-data: installdirs-data-yes -+installdirs-data: installdirs-data-no - if test "$(PACKAGE)" = "gettext-tools"; then \ - $(mkinstalldirs) $(DESTDIR)$(gettextsrcdir); \ - else \ -@@ -295,7 +295,7 @@ installcheck: - - uninstall: uninstall-exec uninstall-data - uninstall-exec: --uninstall-data: uninstall-data-yes -+uninstall-data: uninstall-data-no - if test "$(PACKAGE)" = "gettext-tools"; then \ - for file in $(DISTFILES.common) Makevars.template; do \ - rm -f $(DESTDIR)$(gettextsrcdir)/$$file; \ diff --git a/package/wput/patches/patch-po_Makefile_in b/package/wput/patches/patch-po_Makefile_in deleted file mode 100644 index 45610ddbb..000000000 --- a/package/wput/patches/patch-po_Makefile_in +++ /dev/null @@ -1,50 +0,0 @@ ---- wput-0.6.1.orig/po/Makefile.in 2007-12-12 18:30:04.000000000 +0100 -+++ wput-0.6.1/po/Makefile.in 2010-02-06 04:45:45.453076297 +0100 -@@ -20,9 +20,9 @@ srcdir = . - top_srcdir = .. - - --prefix = /usr/local -+prefix = /usr - exec_prefix = ${prefix} --datadir = ${prefix}/share -+datadir = /usr/share - localedir = $(datadir)/locale - gettextsrcdir = $(datadir)/gettext/po - -@@ -74,7 +74,7 @@ CATALOGS = @CATALOGS@ - mv t-$@ $@ - - --all: all-yes -+all: all-no - - all-yes: stamp-po - all-no: -@@ -141,7 +141,7 @@ $(POFILES): $(srcdir)/$(DOMAIN).pot - - install: install-exec install-data - install-exec: --install-data: install-data-yes -+install-data: install-data-no - if test "$(PACKAGE)" = "gettext-tools"; then \ - $(mkinstalldirs) $(DESTDIR)$(gettextsrcdir); \ - for file in $(DISTFILES.common) Makevars.template; do \ -@@ -200,7 +200,7 @@ install-strip: install - - installdirs: installdirs-exec installdirs-data - installdirs-exec: --installdirs-data: installdirs-data-yes -+installdirs-data: installdirs-data-no - if test "$(PACKAGE)" = "gettext-tools"; then \ - $(mkinstalldirs) $(DESTDIR)$(gettextsrcdir); \ - else \ -@@ -245,7 +245,7 @@ installcheck: - - uninstall: uninstall-exec uninstall-data - uninstall-exec: --uninstall-data: uninstall-data-yes -+uninstall-data: uninstall-data-no - if test "$(PACKAGE)" = "gettext-tools"; then \ - for file in $(DISTFILES.common) Makevars.template; do \ - rm -f $(DESTDIR)$(gettextsrcdir)/$$file; \ diff --git a/package/wput/patches/patch-src_Makefile b/package/wput/patches/patch-src_Makefile deleted file mode 100644 index 42f51da44..000000000 --- a/package/wput/patches/patch-src_Makefile +++ /dev/null @@ -1,19 +0,0 @@ ---- wput-0.6.1.orig/src/Makefile 2007-12-12 18:30:04.000000000 +0100 -+++ wput-0.6.1/src/Makefile 2010-02-06 04:45:45.363075315 +0100 -@@ -1,12 +1,12 @@ - #wput.mk - #mm make file for wput - SHELL=/bin/bash --prefix=/usr/local -+prefix=/usr - bindir=${exec_prefix}/bin - localedir=$(prefix)/share/locale --CC=gcc --CFLAGS= -Wall -g -DLOCALEDIR=\"$(localedir)\" -INONE/include --LIBS= -lgnutls-openssl -+CC=/home/wbx/openadk/cross_qemu-x86_uclibc/host/bin/i586-linux-uclibc-gcc -+CFLAGS= -fno-ident -Os -pipe -march=i586 -fomit-frame-pointer -Wall -DLOCALEDIR=\"$(localedir)\" -+LIBS= - EXE=../wput - GETOPT= - MEMDBG= diff --git a/package/wput/patches/patch-src_Makefile_in b/package/wput/patches/patch-src_Makefile_in new file mode 100644 index 000000000..d59c3a721 --- /dev/null +++ b/package/wput/patches/patch-src_Makefile_in @@ -0,0 +1,19 @@ +--- wput-0.6.1.orig/src/Makefile.in 2007-12-12 18:30:04.000000000 +0100 ++++ wput-0.6.1/src/Makefile.in 2011-01-17 17:04:46.000000000 +0100 +@@ -6,6 +6,7 @@ bindir=@bindir@ + localedir=$(prefix)/share/locale + CC=@CC@ + CFLAGS= @CFLAGS@ -DLOCALEDIR=\"$(localedir)\" @GNUTLS_CFLAGS@ ++LDFLAGS=@LDFLAGS@ + LIBS=@LIBINTL@ @LIBS@ @GNUTLS_LIBS@ + EXE=../wput + GETOPT=@GETOPT@ +@@ -23,7 +24,7 @@ ftplib.o: socketlib.h ftplib.h + ftp-ls.o: ftp.h wget.h url.h + + wput: $(OBJ) +- $(CC) -o $(EXE) $(OBJ) $(LIBS) ++ $(CC) $(LDFLAGS) -o $(EXE) $(OBJ) $(LIBS) + clean: + rm -f *.o *~ *.bak ../wput getopt/*.o + win-clean: clean diff --git a/package/wput/patches/patch-src_config_h b/package/wput/patches/patch-src_config_h deleted file mode 100644 index 52a23c2ed..000000000 --- a/package/wput/patches/patch-src_config_h +++ /dev/null @@ -1,27 +0,0 @@ ---- wput-0.6.1.orig/src/config.h 2007-12-12 18:30:04.000000000 +0100 -+++ wput-0.6.1/src/config.h 2010-02-06 04:45:45.543084453 +0100 -@@ -7,13 +7,13 @@ - #define HAVE_IOCTL 1 - - /* Define if you have the <libintl.h> header file. */ --#define HAVE_LIBINTL_H 1 -+/* #undef HAVE_LIBINTL_H */ - - /* Define if you have the <locale.h> header file. */ - #define HAVE_LOCALE_H 1 - - /* Define this if you want the NLS support. */ --#define ENABLE_NLS 1 -+/* #undef ENABLE_NLS */ - - /* Define to 1 if you have the <gnugetopt/getopt.h> header file. */ - /* #undef HAVE_GNUGETOPT_GETOPT_H */ -@@ -64,7 +64,7 @@ - #define STDC_HEADERS 1 - - /* Define if all libs needed for ssl support are existing */ --#define HAVE_SSL 1 -+/* #undef HAVE_SSL */ - - /* Define to 1 if you have the long long type */ - #define HAVE_LONG_LONG 1 diff --git a/package/xf86-input-evtouch/patches/patch-ltmain_sh b/package/xf86-input-evtouch/patches/patch-ltmain_sh new file mode 100644 index 000000000..83e749c0b --- /dev/null +++ b/package/xf86-input-evtouch/patches/patch-ltmain_sh @@ -0,0 +1,11 @@ +--- xf86-input-evtouch-0.8.8.orig/ltmain.sh 2008-11-09 22:01:01.000000000 +0100 ++++ xf86-input-evtouch-0.8.8/ltmain.sh 2011-01-17 17:08:24.000000000 +0100 +@@ -4238,7 +4238,7 @@ func_mode_link () + # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC + # @file GCC response files + -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) + func_quote_for_eval "$arg" + arg="$func_quote_for_eval_result" + func_append compile_command " $arg" diff --git a/package/xf86-input-keyboard/patches/patch-ltmain_sh b/package/xf86-input-keyboard/patches/patch-ltmain_sh new file mode 100644 index 000000000..754d116e2 --- /dev/null +++ b/package/xf86-input-keyboard/patches/patch-ltmain_sh @@ -0,0 +1,11 @@ +--- xf86-input-keyboard-1.4.0.orig/ltmain.sh 2009-09-14 02:35:10.000000000 +0200 ++++ xf86-input-keyboard-1.4.0/ltmain.sh 2011-01-17 17:18:30.000000000 +0100 +@@ -4765,7 +4765,7 @@ func_mode_link () + # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC + # @file GCC response files + -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) + func_quote_for_eval "$arg" + arg="$func_quote_for_eval_result" + func_append compile_command " $arg" diff --git a/package/xf86-input-mouse/patches/patch-ltmain_sh b/package/xf86-input-mouse/patches/patch-ltmain_sh new file mode 100644 index 000000000..3032ef8fc --- /dev/null +++ b/package/xf86-input-mouse/patches/patch-ltmain_sh @@ -0,0 +1,11 @@ +--- xf86-input-mouse-1.5.0.orig/ltmain.sh 2009-04-08 14:13:48.000000000 +0200 ++++ xf86-input-mouse-1.5.0/ltmain.sh 2011-01-17 17:28:10.000000000 +0100 +@@ -4765,7 +4765,7 @@ func_mode_link () + # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC + # @file GCC response files + -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) + func_quote_for_eval "$arg" + arg="$func_quote_for_eval_result" + func_append compile_command " $arg" diff --git a/package/xf86-video-cirrus/patches/patch-ltmain_sh b/package/xf86-video-cirrus/patches/patch-ltmain_sh new file mode 100644 index 000000000..eb8f42a6c --- /dev/null +++ b/package/xf86-video-cirrus/patches/patch-ltmain_sh @@ -0,0 +1,11 @@ +--- xf86-video-cirrus-1.3.2.orig/ltmain.sh 2008-08-30 00:27:25.000000000 +0200 ++++ xf86-video-cirrus-1.3.2/ltmain.sh 2011-01-17 17:38:35.000000000 +0100 +@@ -1676,7 +1676,7 @@ EOF + # -F/path gives path to uninstalled frameworks, gcc on darwin + # @file GCC response files + -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) + + # Unknown arguments in both finalize_command and compile_command need + # to be aesthetically quoted because they are evaled later. diff --git a/package/xf86-video-geode/patches/patch-ltmain_sh b/package/xf86-video-geode/patches/patch-ltmain_sh new file mode 100644 index 000000000..6c6beb7dd --- /dev/null +++ b/package/xf86-video-geode/patches/patch-ltmain_sh @@ -0,0 +1,11 @@ +--- xf86-video-geode-2.11.6.orig/ltmain.sh 2009-09-27 14:01:31.000000000 +0200 ++++ xf86-video-geode-2.11.6/ltmain.sh 2011-01-17 17:43:27.000000000 +0100 +@@ -4765,7 +4765,7 @@ func_mode_link () + # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC + # @file GCC response files + -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) + func_quote_for_eval "$arg" + arg="$func_quote_for_eval_result" + func_append compile_command " $arg" diff --git a/package/xf86-video-intel/patches/patch-ltmain_sh b/package/xf86-video-intel/patches/patch-ltmain_sh new file mode 100644 index 000000000..5cf546d2a --- /dev/null +++ b/package/xf86-video-intel/patches/patch-ltmain_sh @@ -0,0 +1,11 @@ +--- xf86-video-intel-2.13.0.orig/ltmain.sh 2010-02-25 18:09:43.000000000 +0100 ++++ xf86-video-intel-2.13.0/ltmain.sh 2011-01-17 17:47:33.000000000 +0100 +@@ -4765,7 +4765,7 @@ func_mode_link () + # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC + # @file GCC response files + -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) + func_quote_for_eval "$arg" + arg="$func_quote_for_eval_result" + func_append compile_command " $arg" diff --git a/package/xf86-video-siliconmotion/patches/patch-ltmain_sh b/package/xf86-video-siliconmotion/patches/patch-ltmain_sh new file mode 100644 index 000000000..8c977addb --- /dev/null +++ b/package/xf86-video-siliconmotion/patches/patch-ltmain_sh @@ -0,0 +1,11 @@ +--- xf86-video-siliconmotion-1.7.3.orig/ltmain.sh 2008-08-30 00:27:25.000000000 +0200 ++++ xf86-video-siliconmotion-1.7.3/ltmain.sh 2011-01-17 17:49:45.000000000 +0100 +@@ -1676,7 +1676,7 @@ EOF + # -F/path gives path to uninstalled frameworks, gcc on darwin + # @file GCC response files + -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) + + # Unknown arguments in both finalize_command and compile_command need + # to be aesthetically quoted because they are evaled later. diff --git a/package/xorg-server/Makefile b/package/xorg-server/Makefile index 9aa7eaba9..92d5ddeaa 100644 --- a/package/xorg-server/Makefile +++ b/package/xorg-server/Makefile @@ -22,10 +22,10 @@ PKG_SITES:= http://xorg.freedesktop.org/archive/individual/xserver/ PKG_CFLINE_XORG_SERVER:=depends on ADK_TARGET_WITH_VGA -PKG_FLAVOURS:= WITH_DRI -PKGFS_WITH_DRI:= mesalib -PKGFD_WITH_DRI:= enable DRI/DRI2 support -PKGFB_WITH_DRI:= xf86driproto glproto dri2proto MesaLib +PKG_FLAVOURS_XORG_SERVER:= WITH_DRI +PKGFS_WITH_DRI:= mesalib +PKGFD_WITH_DRI:= enable DRI/DRI2 support +PKGFB_WITH_DRI:= xf86driproto glproto dri2proto MesaLib include $(TOPDIR)/mk/package.mk diff --git a/package/xorg-server/patches/patch-ltmain_sh b/package/xorg-server/patches/patch-ltmain_sh new file mode 100644 index 000000000..779bb5238 --- /dev/null +++ b/package/xorg-server/patches/patch-ltmain_sh @@ -0,0 +1,11 @@ +--- xorg-server-1.7.6.orig/ltmain.sh 2010-02-05 04:18:39.000000000 +0100 ++++ xorg-server-1.7.6/ltmain.sh 2011-01-17 16:06:33.000000000 +0100 +@@ -4765,7 +4765,7 @@ func_mode_link () + # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC + # @file GCC response files + -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) + func_quote_for_eval "$arg" + arg="$func_quote_for_eval_result" + func_append compile_command " $arg" diff --git a/package/xz/patches/patch-build-aux_ltmain_sh b/package/xz/patches/patch-build-aux_ltmain_sh new file mode 100644 index 000000000..b9ae6dddf --- /dev/null +++ b/package/xz/patches/patch-build-aux_ltmain_sh @@ -0,0 +1,11 @@ +--- xz-5.0.0.orig/build-aux/ltmain.sh 2010-10-23 16:48:07.000000000 +0200 ++++ xz-5.0.0/build-aux/ltmain.sh 2011-01-17 17:54:37.000000000 +0100 +@@ -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*|@*|-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/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 |