diff options
| -rw-r--r-- | package/gpsd/Makefile | 7 | ||||
| -rw-r--r-- | package/krb5/Makefile | 4 | ||||
| -rw-r--r-- | package/krb5/patches/patch-src_util_export-check_pl | 11 | ||||
| -rw-r--r-- | package/libtool/Makefile | 4 | ||||
| -rwxr-xr-x | scripts/adkprepare.sh | 1 | ||||
| -rw-r--r-- | scripts/scan-pkgs.sh | 6 |
6 files changed, 25 insertions, 8 deletions
diff --git a/package/gpsd/Makefile b/package/gpsd/Makefile index 174690c7b..167af550a 100644 --- a/package/gpsd/Makefile +++ b/package/gpsd/Makefile @@ -27,9 +27,7 @@ CONFIGURE_ENV+= EGREP="grep -E" \ ac_cv_func_strlcpy=no \ ac_cv_func_strlcat=no \ ac_cv_lib_nsl_gethostbyname=no -CONFIGURE_ARGS+= --without-x \ - --disable-dbus - +CONFIGURE_ARGS+= --disable-dbus TCFLAGS+= -fPIC ifeq ($(ADK_COMPILE_GPSD_WITH_UCLIBCXX),y) @@ -40,9 +38,6 @@ else TLDFLAGS+= -shared -pthread endif -post-extract: - #@find ${WRKBUILD} -name *.rej -exec rm {} \; - ifeq (${ADK_COMPILE_GPSD_WITH_UCLIBCXX},y) # add workaround because libtool tries to link libstdc++ post-configure: diff --git a/package/krb5/Makefile b/package/krb5/Makefile index 7d3834990..bb4e809c1 100644 --- a/package/krb5/Makefile +++ b/package/krb5/Makefile @@ -46,6 +46,10 @@ CONFIGURE_ENV+= krb5_cv_attr_constructor_destructor=yes,yes \ post-extract: (cd ${WRKDIR}; tar xzf ${PKG_NAME}-${PKG_VERSION}.tar.gz) +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} ${INSTALL_DIR} ${IDIR_KRB5_SERVER}/etc ${INSTALL_DIR} ${IDIR_KRB5_SERVER}/etc/krb5kdc diff --git a/package/krb5/patches/patch-src_util_export-check_pl b/package/krb5/patches/patch-src_util_export-check_pl new file mode 100644 index 000000000..04d21a299 --- /dev/null +++ b/package/krb5/patches/patch-src_util_export-check_pl @@ -0,0 +1,11 @@ +--- krb5-1.8.1.orig/src/util/export-check.pl Sun Aug 1 18:36:11 2010 ++++ krb5-1.8.1/src/util/export-check.pl Sun Aug 1 18:27:23 2010 +@@ -38,7 +38,7 @@ if ($#ARGV != 1) { + my($exfile, $libfile) = @ARGV; + + @missing = (); +-open NM, "nm -Dg --defined-only $libfile |" || die "can't run nm on $libfile: $!"; ++open NM, "@@NM@@ -Dg --defined-only $libfile |" || die "can't run nm on $libfile: $!"; + open EXPORT, "< $exfile" || die "can't read $exfile: $!"; + + @export = <EXPORT>; diff --git a/package/libtool/Makefile b/package/libtool/Makefile index dbf2e3c05..1adc4881b 100644 --- a/package/libtool/Makefile +++ b/package/libtool/Makefile @@ -17,6 +17,10 @@ include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,LIBTOOL,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) $(eval $(call PKG_template,LIBLTDL,libltdl,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +ifeq (${ADK_HOST_OPENBSD},y) +XAKE_FLAGS+= AUTOCONF_VERSION=2.62 +endif + post-install: ${INSTALL_DIR} ${IDIR_LIBLTDL}/usr/lib ${CP} ${WRKINST}/usr/lib/libltdl.so* ${IDIR_LIBLTDL}/usr/lib/ diff --git a/scripts/adkprepare.sh b/scripts/adkprepare.sh index 08503bafd..d90b9ef95 100755 --- a/scripts/adkprepare.sh +++ b/scripts/adkprepare.sh @@ -47,6 +47,7 @@ openbsd_full() { pkg_add -v m4 pkg_add -v autoconf-2.62p0 pkg_add -v gperf + pkg_add -v python-2.6.3p1 } netbsd() { diff --git a/scripts/scan-pkgs.sh b/scripts/scan-pkgs.sh index 303935a9b..aff3f61f8 100644 --- a/scripts/scan-pkgs.sh +++ b/scripts/scan-pkgs.sh @@ -32,6 +32,10 @@ if [[ -n $ADK_NATIVE ]];then fi fi +if [[ -n $ADK_PACKAGE_GPSD ]]; then + NEED_PYTHON="$NEED_PYTHON gpsd" +fi + if [[ -n $ADK_PACKAGE_FIREFOX ]]; then NEED_ZIP="$NEED_ZIP firefox" NEED_LIBIDL="$NEED_LIBIDL firefox" @@ -265,5 +269,3 @@ if [[ -n $NEED_PYTHON ]]; then fi exit $out - -exit $out |