diff mbox

[03/10] libapr-util: New recipe

Message ID 844216ee1a9c797be07b046060cb924a083d7b29.1388738593.git.kibo@prevas.dk
State Accepted
Delegated to: Esben Haabendal
Headers show

Commit Message

Kim Bøndergaard Jan. 3, 2014, 8:49 a.m. UTC
---
 recipes/libapr/libapr-util/configfix.patch | 51 ++++++++++++++++++++++++++++++
 recipes/libapr/libapr-util_1.5.3.oe        | 39 +++++++++++++++++++++++
 recipes/libapr/libapr-util_1.5.3.oe.sig    |  1 +
 3 files changed, 91 insertions(+)
 create mode 100644 recipes/libapr/libapr-util/configfix.patch
 create mode 100644 recipes/libapr/libapr-util_1.5.3.oe
 create mode 100644 recipes/libapr/libapr-util_1.5.3.oe.sig

Comments

Esben Haabendal Feb. 7, 2014, 9:15 a.m. UTC | #1
Merged to master, thanks.

/Esben
diff mbox

Patch

diff --git a/recipes/libapr/libapr-util/configfix.patch b/recipes/libapr/libapr-util/configfix.patch
new file mode 100644
index 0000000..dbb1148
--- /dev/null
+++ b/recipes/libapr/libapr-util/configfix.patch
@@ -0,0 +1,51 @@ 
+Upstream-Status: Inappropriate [configuration]
+
+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/recipes/libapr/libapr-util_1.5.3.oe b/recipes/libapr/libapr-util_1.5.3.oe
new file mode 100644
index 0000000..55453e6
--- /dev/null
+++ b/recipes/libapr/libapr-util_1.5.3.oe
@@ -0,0 +1,39 @@ 
+DESCRIPTION = "software libraries providing a predictable and consistent interface to underlying platform-specific implementations"
+HOMEPAGE = "apr.apache.org"
+
+inherit autotools-autoreconf pkgconfig library binconfig c
+
+SRC_URI = "http://apache.mirrors.spacedump.net/apr/apr-util-${PV}.tar.bz2 \
+	  file://configfix.patch\
+	  "
+LICENSE = "Apache-2.0"
+RECIPE_TYPES = "machine sdk"
+
+DEPENDS += "libapr-dev libapr libexpat libdl libcrypt"
+DEPENDS_${PN} += "libapr libdl libexpat libcrypt"
+RDEPENDS_${PN} += "libapr libdl libexpat libcrypt"
+
+S = "${SRCDIR}/apr-util-${PV}"
+
+EXTRA_OECONF = "--with-apr=${HOST_SYSROOT}/usr/bin/apr-1-config\
+	        --without-odbc \
+		--without-pgsql \
+		--without-sqlite2 \
+		--without-sqlite3 \
+		--with-expat=${HOST_SYSROOT} \
+		"
+CFLAGS += "-I${HOST_SYSROOT}${includedir} -Wl,-lcrypt"
+
+do_configure[postfuncs] = "do_configure_apr"
+
+do_configure_apr() {
+	cp ${HOST_SYSROOT}/usr/share/build-1/apr_rules.mk ${S}/build/rules.mk
+	sed -i "s#apr_builddir=#apr_builddir=${HOST_SYSROOT}#" ${S}/build/rules.mk
+	sed -i "s#apr_builders=#apr_builders=${HOST_SYSROOT}#" ${S}/build/rules.mk
+	sed -i "s#top_builddir=#top_builddir=${HOST_SYSROOT}#" ${S}/build/rules.mk
+
+}
+
+FILES_${PN}-dev += "${libdir}/aprutil.exp ${datadir}/build-1/*"
+
+PROVIDES_${PN} = "libaprutil"
diff --git a/recipes/libapr/libapr-util_1.5.3.oe.sig b/recipes/libapr/libapr-util_1.5.3.oe.sig
new file mode 100644
index 0000000..4345472
--- /dev/null
+++ b/recipes/libapr/libapr-util_1.5.3.oe.sig
@@ -0,0 +1 @@ 
+de0184ee03dfdc6dec4d013970d1862251e86925  apr-util-1.5.3.tar.bz2