apr/apr-util: Fix some other config path gremlins breaking builds
This commit is contained in:
parent
a43863b7f1
commit
f51973f5af
|
@ -0,0 +1,49 @@
|
|||
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
|
|
@ -3,9 +3,10 @@ SECTION = "libs"
|
|||
DEPENDS = "apr expat gdbm"
|
||||
LICENSE = "Apache License, Version 2.0"
|
||||
|
||||
PR = "r3"
|
||||
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 \
|
||||
|
|
|
@ -45,7 +45,7 @@ Index: apr-1.3.3/apr-config.in
|
|||
- else
|
||||
- flags="$flags $LA_FILE"
|
||||
- fi
|
||||
+ flags="$flags ll${APR_LIBNAME}"
|
||||
+ flags="$flags -l${APR_LIBNAME}"
|
||||
;;
|
||||
--shlib-path-var)
|
||||
echo "$SHLIBPATH_VAR"
|
||||
|
|
|
@ -2,7 +2,7 @@ DESCRIPTION = "Apache Portable Runtime (APR) library"
|
|||
SECTION = "libs"
|
||||
LICENSE = "Apache License, Version 2.0"
|
||||
|
||||
PR = "r2"
|
||||
PR = "r3"
|
||||
|
||||
SRC_URI = "${APACHE_MIRROR}/apr/${P}.tar.bz2 \
|
||||
file://configure_fixes.patch;patch=1 \
|
||||
|
|
|
@ -5,7 +5,7 @@ RDEPENDS = "neon"
|
|||
LICENSE = "Apache BSD"
|
||||
HOMEPAGE = "http://subversion.tigris.org"
|
||||
|
||||
PR = "r4"
|
||||
PR = "r5"
|
||||
|
||||
SRC_URI = "http://subversion.tigris.org/downloads/${P}.tar.bz2 \
|
||||
file://disable-revision-install.patch;patch=1 \
|
||||
|
|
Loading…
Reference in New Issue