summaryrefslogtreecommitdiff
path: root/meta/packages/apr
diff options
context:
space:
mode:
Diffstat (limited to 'meta/packages/apr')
-rw-r--r--meta/packages/apr/apr-util/configfix.patch49
-rw-r--r--meta/packages/apr/apr-util/configure_fixes.patch27
-rw-r--r--meta/packages/apr/apr-util/configure_fixes.patch.old25
-rw-r--r--meta/packages/apr/apr-util_1.3.4.bb27
-rw-r--r--meta/packages/apr/apr/cleanup.patch42
-rw-r--r--meta/packages/apr/apr/configfix.patch51
-rw-r--r--meta/packages/apr/apr/configure_fixes.patch66
-rw-r--r--meta/packages/apr/apr_1.3.3.bb34
8 files changed, 0 insertions, 321 deletions
diff --git a/meta/packages/apr/apr-util/configfix.patch b/meta/packages/apr/apr-util/configfix.patch
deleted file mode 100644
index a8953e524..000000000
--- a/meta/packages/apr/apr-util/configfix.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-Index: apr-util-1.3.4/apu-config.in
-===================================================================
---- apr-util-1.3.4.orig/apu-config.in 2009-01-12 17:08:06.000000000 +0000
-+++ apr-util-1.3.4/apu-config.in 2009-01-12 17:09:00.000000000 +0000
-@@ -134,14 +134,7 @@
- exit 0
- ;;
- --includes)
-- if test "$location" = "installed"; then
- flags="$flags -I$includedir $INCLUDES"
-- elif test "$location" = "source"; then
-- flags="$flags -I$APU_SOURCE_DIR/include $INCLUDES"
-- else
-- # this is for VPATH builds
-- flags="$flags -I$APU_BUILD_DIR/include -I$APU_SOURCE_DIR/include $INCLUDES"
-- fi
- ;;
- --ldflags)
- flags="$flags $LDFLAGS"
-@@ -155,28 +148,10 @@
- exit 0
- ;;
- --link-ld)
-- if test "$location" = "installed"; then
-- ### avoid using -L if libdir is a "standard" location like /usr/lib
- flags="$flags -L$libdir -l$APRUTIL_LIBNAME"
-- else
-- flags="$flags -L$APU_BUILD_DIR -l$APRUTIL_LIBNAME"
-- fi
- ;;
- --link-libtool)
-- # If the LA_FILE exists where we think it should be, use it. If we're
-- # installed and the LA_FILE does not exist, assume to use -L/-l
-- # (the LA_FILE may not have been installed). If we're building ourselves,
-- # we'll assume that at some point the .la file be created.
-- if test -f "$LA_FILE"; then
-- flags="$flags $LA_FILE"
-- elif test "$location" = "installed"; then
-- ### avoid using -L if libdir is a "standard" location like /usr/lib
-- # Since the user is specifying they are linking with libtool, we
-- # *know* that -R will be recognized by libtool.
-- flags="$flags -L$libdir -R$libdir -l$APRUTIL_LIBNAME"
-- else
-- flags="$flags $LA_FILE"
-- fi
-+ flags="$flags -l$APRUTIL_LIBNAME"
- ;;
- --apu-la-file)
- if test -f "$LA_FILE"; then
diff --git a/meta/packages/apr/apr-util/configure_fixes.patch b/meta/packages/apr/apr-util/configure_fixes.patch
deleted file mode 100644
index 0b2a0903e..000000000
--- a/meta/packages/apr/apr-util/configure_fixes.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-Index: apr-util-1.3.4/configure.in
-===================================================================
---- apr-util-1.3.4.orig/configure.in
-+++ apr-util-1.3.4/configure.in
-@@ -8,14 +8,14 @@ AC_INIT(export_vars.sh.in)
- AC_CONFIG_HEADER(include/private/apu_config.h)
- AC_CONFIG_AUX_DIR(build)
-
--sinclude(build/apu-conf.m4)
--sinclude(build/apu-iconv.m4)
--sinclude(build/apu-hints.m4)
--sinclude(build/apr_common.m4)
--sinclude(build/find_apr.m4)
--sinclude(build/dbm.m4)
--sinclude(build/dbd.m4)
--sinclude(build/dso.m4)
-+#sinclude(build/apu-conf.m4)
-+#sinclude(build/apu-iconv.m4)
-+#sinclude(build/apu-hints.m4)
-+#sinclude(build/apr_common.m4)
-+#sinclude(build/find_apr.m4)
-+#sinclude(build/dbm.m4)
-+#sinclude(build/dbd.m4)
-+#sinclude(build/dso.m4)
-
- dnl Generate ./config.nice for reproducing runs of configure
- dnl
diff --git a/meta/packages/apr/apr-util/configure_fixes.patch.old b/meta/packages/apr/apr-util/configure_fixes.patch.old
deleted file mode 100644
index 16f88b3bb..000000000
--- a/meta/packages/apr/apr-util/configure_fixes.patch.old
+++ /dev/null
@@ -1,25 +0,0 @@
-Index: apr-util-1.2.12/configure.in
-===================================================================
---- apr-util-1.2.12.orig/configure.in 2008-03-08 19:15:00.000000000 +0000
-+++ apr-util-1.2.12/configure.in 2008-03-08 19:15:13.000000000 +0000
-@@ -8,13 +8,13 @@
- AC_CONFIG_HEADER(include/private/apu_config.h)
- AC_CONFIG_AUX_DIR(build)
-
--sinclude(build/apu-conf.m4)
--sinclude(build/apu-iconv.m4)
--sinclude(build/apu-hints.m4)
--sinclude(build/apr_common.m4)
--sinclude(build/find_apr.m4)
--sinclude(build/dbm.m4)
--sinclude(build/dbd.m4)
-+#sinclude(build/apu-conf.m4)
-+#sinclude(build/apu-iconv.m4)
-+#sinclude(build/apu-hints.m4)
-+#sinclude(build/apr_common.m4)
-+#sinclude(build/find_apr.m4)
-+#sinclude(build/dbm.m4)
-+#sinclude(build/dbd.m4)
-
- dnl Generate ./config.nice for reproducing runs of configure
- dnl
diff --git a/meta/packages/apr/apr-util_1.3.4.bb b/meta/packages/apr/apr-util_1.3.4.bb
deleted file mode 100644
index 2e608e8a5..000000000
--- a/meta/packages/apr/apr-util_1.3.4.bb
+++ /dev/null
@@ -1,27 +0,0 @@
-DESCRIPTION = "Apache Portable Runtime (APR) companion library"
-SECTION = "libs"
-DEPENDS = "apr expat gdbm"
-LICENSE = "Apache License, Version 2.0"
-
-PR = "r5"
-
-SRC_URI = "${APACHE_MIRROR}/apr/${P}.tar.gz \
- file://configfix.patch;patch=1 \
- file://configure_fixes.patch;patch=1"
-
-EXTRA_OECONF = "--with-apr=${STAGING_BINDIR_CROSS}/apr-1-config \
- --with-dbm=gdbm \
- --with-gdbm=${STAGING_DIR_HOST}${prefix} \
- --without-sqlite2 \
- --without-sqlite3 \
- --with-expat=${STAGING_DIR_HOST}${prefix}"
-
-
-inherit autotools lib_package binconfig
-
-OE_BINCONFIG_EXTRA_MANGLE = " -e 's:location=source:location=installed:'"
-
-do_configure_prepend() {
- cp ${STAGING_DATADIR}/apr/apr_rules.mk ${S}/build/rules.mk
-}
-
diff --git a/meta/packages/apr/apr/cleanup.patch b/meta/packages/apr/apr/cleanup.patch
deleted file mode 100644
index fd7482648..000000000
--- a/meta/packages/apr/apr/cleanup.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-Index: apr-1.3.3/build/buildcheck.sh
-===================================================================
---- apr-1.3.3.orig/build/buildcheck.sh 2009-01-15 13:32:33.000000000 +0000
-+++ apr-1.3.3/build/buildcheck.sh 2009-01-15 13:33:06.000000000 +0000
-@@ -32,35 +32,4 @@
- echo "buildconf: autoconf version $ac_version (ok)"
- fi
-
--# Sample libtool --version outputs:
--# ltmain.sh (GNU libtool) 1.3.3 (1.385.2.181 1999/07/02 15:49:11)
--# ltmain.sh (GNU libtool 1.1361 2004/01/02 23:10:52) 1.5a
--# output is multiline from 1.5 onwards
--
--# Require libtool 1.4 or newer
--libtool=`build/PrintPath glibtool libtool libtool15 libtool14`
--lt_pversion=`$libtool --version 2>/dev/null|sed -e 's/([^)]*)//g;s/^[^0-9]*//;s/[- ].*//g;q'`
--if test -z "$lt_pversion"; then
--echo "buildconf: libtool not found."
--echo " You need libtool version 1.4 or newer installed"
--echo " to build APR from SVN."
--exit 1
--fi
--lt_version=`echo $lt_pversion|sed -e 's/\([a-z]*\)$/.\1/'`
--IFS=.; set $lt_version; IFS=' '
--lt_status="good"
--if test "$1" = "1"; then
-- if test "$2" -lt "4"; then
-- lt_status="bad"
-- fi
--fi
--if test $lt_status = "good"; then
-- echo "buildconf: libtool version $lt_pversion (ok)"
-- exit 0
--fi
--
--echo "buildconf: libtool version $lt_pversion found."
--echo " You need libtool version 1.4 or newer installed"
--echo " to build APR from SVN."
--
--exit 1
-+exit 0
-\ No newline at end of file
diff --git a/meta/packages/apr/apr/configfix.patch b/meta/packages/apr/apr/configfix.patch
deleted file mode 100644
index 995555e8b..000000000
--- a/meta/packages/apr/apr/configfix.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-Index: apr-1.3.3/apr-config.in
-===================================================================
---- apr-1.3.3.orig/apr-config.in 2009-01-12 15:16:31.000000000 +0000
-+++ apr-1.3.3/apr-config.in 2009-01-12 15:19:25.000000000 +0000
-@@ -152,14 +152,7 @@
- flags="$flags $LDFLAGS"
- ;;
- --includes)
-- if test "$location" = "installed"; then
- flags="$flags -I$includedir $EXTRA_INCLUDES"
-- elif test "$location" = "source"; then
-- flags="$flags -I$APR_SOURCE_DIR/include $EXTRA_INCLUDES"
-- else
-- # this is for VPATH builds
-- flags="$flags -I$APR_BUILD_DIR/include -I$APR_SOURCE_DIR/include $EXTRA_INCLUDES"
-- fi
- ;;
- --srcdir)
- echo $APR_SOURCE_DIR
-@@ -181,29 +167,14 @@
- exit 0
- ;;
- --link-ld)
-- if test "$location" = "installed"; then
-- ### avoid using -L if libdir is a "standard" location like /usr/lib
-- flags="$flags -L$libdir -l${APR_LIBNAME}"
-- else
-- ### this surely can't work since the library is in .libs?
-- flags="$flags -L$APR_BUILD_DIR -l${APR_LIBNAME}"
-- fi
-+ flags="$flags -l${APR_LIBNAME}"
- ;;
- --link-libtool)
- # If the LA_FILE exists where we think it should be, use it. If we're
- # installed and the LA_FILE does not exist, assume to use -L/-l
- # (the LA_FILE may not have been installed). If we're building ourselves,
- # we'll assume that at some point the .la file be created.
-- if test -f "$LA_FILE"; then
-- flags="$flags $LA_FILE"
-- elif test "$location" = "installed"; then
-- ### avoid using -L if libdir is a "standard" location like /usr/lib
-- # Since the user is specifying they are linking with libtool, we
-- # *know* that -R will be recognized by libtool.
-- flags="$flags -L$libdir -R$libdir -l${APR_LIBNAME}"
-- else
-- flags="$flags $LA_FILE"
-- fi
-+ flags="$flags -l${APR_LIBNAME}"
- ;;
- --shlib-path-var)
- echo "$SHLIBPATH_VAR"
diff --git a/meta/packages/apr/apr/configure_fixes.patch b/meta/packages/apr/apr/configure_fixes.patch
deleted file mode 100644
index 86ceb8cf0..000000000
--- a/meta/packages/apr/apr/configure_fixes.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-Index: apr-1.3.3/configure.in
-===================================================================
---- apr-1.3.3.orig/configure.in
-+++ apr-1.3.3/configure.in
-@@ -794,39 +794,6 @@ AC_CHECK_FUNCS([mmap munmap shm_open shm
- create_area])
-
- APR_CHECK_DEFINE(MAP_ANON, sys/mman.h)
--AC_CHECK_FILE(/dev/zero)
--
--# Not all systems can mmap /dev/zero (such as HP-UX). Check for that.
--if test "$ac_cv_func_mmap" = "yes" &&
-- test "$ac_cv_file__dev_zero" = "yes"; then
-- AC_MSG_CHECKING(for mmap that can map /dev/zero)
-- AC_TRY_RUN([
--#include <sys/types.h>
--#include <sys/stat.h>
--#include <fcntl.h>
--#ifdef HAVE_SYS_MMAN_H
--#include <sys/mman.h>
--#endif
-- int main()
-- {
-- int fd;
-- void *m;
-- fd = open("/dev/zero", O_RDWR);
-- if (fd < 0) {
-- return 1;
-- }
-- m = mmap(0, sizeof(void*), PROT_READ|PROT_WRITE, MAP_SHARED, fd, 0);
-- if (m == (void *)-1) { /* aka MAP_FAILED */
-- return 2;
-- }
-- if (munmap(m, sizeof(void*)) < 0) {
-- return 3;
-- }
-- return 0;
-- }], [], [ac_cv_file__dev_zero=no], [ac_cv_file__dev_zero=no])
--
-- AC_MSG_RESULT($ac_cv_file__dev_zero)
--fi
-
- # Now we determine which one is our anonymous shmem preference.
- haveshmgetanon="0"
-@@ -1518,13 +1485,14 @@ else
- bigendian=0
- fi
-
--APR_CHECK_SIZEOF_EXTENDED([#include <sys/types.h>
--#include <sys/uio.h>],struct iovec,0)
--if test "$ac_cv_sizeof_struct_iovec" = "0"; then
-- have_iovec=0
--else
-- have_iovec=1
--fi
-+#APR_CHECK_SIZEOF_EXTENDED([#include <sys/types.h>
-+##include <sys/uio.h>],struct iovec,0)
-+#if test "$ac_cv_sizeof_struct_iovec" = "0"; then
-+# have_iovec=0
-+#else
-+# have_iovec=1
-+#fi
-+have_iovec=1
-
- AC_SUBST(voidp_size)
- AC_SUBST(short_value)
diff --git a/meta/packages/apr/apr_1.3.3.bb b/meta/packages/apr/apr_1.3.3.bb
deleted file mode 100644
index a193a18a2..000000000
--- a/meta/packages/apr/apr_1.3.3.bb
+++ /dev/null
@@ -1,34 +0,0 @@
-DESCRIPTION = "Apache Portable Runtime (APR) library"
-SECTION = "libs"
-LICENSE = "Apache License, Version 2.0"
-
-PR = "r5"
-
-SRC_URI = "${APACHE_MIRROR}/apr/${P}.tar.bz2 \
- file://configure_fixes.patch;patch=1 \
- file://cleanup.patch;patch=1 \
- file://configfix.patch;patch=1"
-
-inherit autotools lib_package binconfig
-
-OE_BINCONFIG_EXTRA_MANGLE = " -e 's:location=source:location=installed:'"
-
-do_configure_prepend() {
- cd ${S}
- ./buildconf
-}
-
-SYSROOT_PREPROCESS_FUNCS += "apr_sysroot_preprocess"
-
-apr_sysroot_preprocess () {
- d=${SYSROOT_DESTDIR}${STAGING_DIR_TARGET}${datadir}/apr
- install -d $d/
- cp ${S}/build/apr_rules.mk $d/
- sed -i s,apr_builddir=.*,apr_builddir=,g $d/apr_rules.mk
- sed -i s,apr_builders=.*,apr_builders=,g $d/apr_rules.mk
- sed -i s,LIBTOOL=.*,LIBTOOL=\$\(SHELL\)\ ${TARGET_PREFIX}libtool,g $d/apr_rules.mk
- sed -i s,\$\(apr_builders\),${STAGING_DATADIR}/apr/,g $d/apr_rules.mk
- cp ${S}/build/mkdir.sh $d/
- cp ${S}/build/make_exports.awk $d/
- cp ${S}/build/make_var_export.awk $d/
-}