diff --git a/dependencies/glib-2.18.1-deps.db b/dependencies/glib-2.18.1-deps.db index 7a31d6143b6..859c4a392bb 100644 Binary files a/dependencies/glib-2.18.1-deps.db and b/dependencies/glib-2.18.1-deps.db differ diff --git a/dependencies/pcre-7.8-deps.db b/dependencies/pcre-7.8-deps.db new file mode 100644 index 00000000000..4e4f0446996 Binary files /dev/null and b/dependencies/pcre-7.8-deps.db differ diff --git a/pkgfs.sh b/pkgfs.sh index 63d95cca802..9e0033a08c2 100755 --- a/pkgfs.sh +++ b/pkgfs.sh @@ -362,7 +362,7 @@ extract_tmpl_sources() { [ -z "$pkgname" ] && return 1 - echo ">>> Extracting \`$pkgname' into $PKGFS_BUILDDIR." + echo ">>> Extracting $pkgname into $PKGFS_BUILDDIR." $extract_cmd if [ "$?" -ne 0 ]; then @@ -425,6 +425,7 @@ build_tmpl_sources() # For now, just set LDFLAGS. # export LDFLAGS="-L$PKGFS_MASTERDIR/lib -Wl,-R$PKGFS_MASTERDIR/lib" + # # Packages using GNU autoconf # @@ -592,9 +593,14 @@ install_dependency_tmpl() add_dependency_tolist $pkgdepf for i in ${deps_list}; do + # skip dup deps + check_installed_tmpl $i + [ "$?" -eq 0 ] && continue echo ">>> Installing dependency: $i" install_tmpl "${PKGFS_TEMPLATESDIR}/${i%%-deps.db}.tmpl" done + + deps_list= } install_xstow_tmpl() diff --git a/templates/glib-2.18.1.tmpl b/templates/glib-2.18.1.tmpl index 3bfe7bafa94..6a86a9143ba 100755 --- a/templates/glib-2.18.1.tmpl +++ b/templates/glib-2.18.1.tmpl @@ -4,6 +4,9 @@ extract_sufx=".tar.bz2" patch_files="glib-2.18.1-fix-statfs-netbsd.diff" url=http://ftp.gnome.org/pub/gnome/sources/glib/2.18 make_cmd="$PKGFS_MASTERDIR/bin/gmake" +# Disable FAM for now and use the installed pcre package instead +# of the supplied one. +configure_args="--disable-fam --with-pcre=system" configure_env="ac_cv_path_PKG_CONFIG=$PKGFS_MASTERDIR/bin/pkg-config ac_cv_func_statfs=no" build_style=gnu_configure diff --git a/templates/pcre-7.8.tmpl b/templates/pcre-7.8.tmpl new file mode 100755 index 00000000000..d21c7e1bd5f --- /dev/null +++ b/templates/pcre-7.8.tmpl @@ -0,0 +1,15 @@ +# Template file for 'pcre-7.8' +pkgname=pcre-7.8 +extract_sufx=".tar.bz2" +url=http://kent.dl.sourceforge.net/sourceforge/pcre +build_style=gnu_configure +configure_args="--enable-utf8 --enable-unicode-properties" +short_desc="Perl Compatible Regular Expressions" +maintainer="Juan RP " +checksum=f8cc336f984bce9bfebaef27e6376d84845bce8f +long_desc=" + The PCRE library is a set of functions that implement regular expression + pattern matching using the same syntax and semantics as Perl 5. PCRE + has its own native API, as well as a set of wrapper functions that + correspond to the POSIX regular expression API. The PCRE library is free, + even for building commercial software."