diff --git a/dev-libs/apr_util/apr_util-1.6.0.recipe b/dev-libs/apr_util/apr_util-1.6.0.recipe new file mode 100644 index 000000000..3112d9eb6 --- /dev/null +++ b/dev-libs/apr_util/apr_util-1.6.0.recipe @@ -0,0 +1,86 @@ +SUMMARY="Apache Portable Runtime Utility Library" +DESCRIPTION="The mission of the Apache Portable Runtime (APR) project is to \ +create and maintain software libraries that provide a predictable and \ +consistent interface to underlying platform-specific implementations. +The primary goal is to provide an API to which software developers may code \ +and be assured of predictable if not identical behaviour regardless of the \ +platform on which their software is built, relieving them of the need to code \ +special-case conditions to work around or take advantage of platform-specific \ +deficiencies or features." +HOMEPAGE="http://apr.apache.org/" +COPYRIGHT="2011 The Apache Software Foundation." +LICENSE="Apache v2" +REVISION="1" +SOURCE_URI="http://archive.apache.org/dist/apr/apr-util-$portVersion.tar.gz" +CHECKSUM_SHA256="483ef4d59e6ac9a36c7d3fd87ad7b9db7ad8ae29c06b9dd8ff22dda1cc416389" +SOURCE_DIR="apr-util-$portVersion" +PATCHES="apr_util-$portVersion.patchset" + +ARCHITECTURES="?x86_gcc2 ?x86 x86_64" +SECONDARY_ARCHITECTURES="?x86" + +PROVIDES=" + apr_util$secondaryArchSuffix = $portVersion compat >= 1 + lib:libaprutil_1$secondaryArchSuffix = 0.6.0 compat >= 0 + " +REQUIRES=" + haiku$secondaryArchSuffix + lib:libapr_1$secondaryArchSuffix + lib:libexpat$secondaryArchSuffix + lib:libiconv$secondaryArchSuffix + " + +PROVIDES_devel=" + apr_util${secondaryArchSuffix}_devel = portVersion compat >= 1 + cmd:apu_1_config$secondaryArchSuffix = $portVersion compat >= 1 + devel:libaprutil_1$secondaryArchSuffix = 0.6.0 compat >= 0 + " +REQUIRES_devel=" + apr_util$secondaryArchSuffix == $portVersion base + " + +BUILD_REQUIRES=" + haiku${secondaryArchSuffix}_devel + devel:libapr_1$secondaryArchSuffix >= 0.6.0 + devel:libexpat$secondaryArchSuffix + devel:libiconv$secondaryArchSuffix + " +BUILD_PREREQUIRES=" + cmd:aclocal + cmd:autoconf + cmd:autoheader + cmd:gcc$secondaryArchSuffix + cmd:ld$secondaryArchSuffix + cmd:libtoolize$secondaryArchSuffix + cmd:make + " + +BUILD() +{ + runConfigure ./configure \ + --with-apr=/$relativeBinDir + make $jobArgs +} + +INSTALL() +{ + make install + + # remove libtool library file + rm $libDir/libaprutil-1.la + + # prepare develop/lib + prepareInstalledDevelLibs libaprutil-1 + fixPkgconfig + + # fix apu-1-config + fixDevelopLibDirReferences $binDir/apu-1-config + + # remove superfluous .exp file + rm $libDir/aprutil.exp + + # devel package + packageEntries devel \ + $binDir \ + $developDir +} diff --git a/dev-libs/apr_util/patches/apr_util-1.6.0.patchset b/dev-libs/apr_util/patches/apr_util-1.6.0.patchset new file mode 100644 index 000000000..2dce5ff23 --- /dev/null +++ b/dev-libs/apr_util/patches/apr_util-1.6.0.patchset @@ -0,0 +1,56 @@ +From f36234c7f43ff11e9346fd9975c28d0c18cda6ad Mon Sep 17 00:00:00 2001 +From: Jerome Duval +Date: Sat, 15 Jul 2017 13:53:14 +0200 +Subject: apply patch from 1.5.4. + + +diff --git a/build/apu-conf.m4 b/build/apu-conf.m4 +index 127d75f..d79ea5d 100644 +--- a/build/apu-conf.m4 ++++ b/build/apu-conf.m4 +@@ -141,10 +141,10 @@ AC_ARG_WITH([expat], + else + # Add given path to standard search paths if appropriate: + if test "$withval" != "/usr"; then +- APR_ADDTO(LDFLAGS, [-L$withval/lib]) +- APR_ADDTO(CPPFLAGS, [-I$withval/include]) +- APR_ADDTO(APRUTIL_INCLUDES, [-I$withval/include]) +- APR_ADDTO(APRUTIL_LDFLAGS, [-L$withval/lib]) ++ APR_ADDTO(LDFLAGS, [-L$withval/develop/lib]) ++ APR_ADDTO(CPPFLAGS, [-I$withval/develop/headers]) ++ APR_ADDTO(APRUTIL_INCLUDES, [-I$withval/develop/headers]) ++ APR_ADDTO(APRUTIL_LDFLAGS, [-L$withval/develop/lib]) + fi + fi + ]) +diff --git a/config.layout b/config.layout +index 907d0bb..b552f5d 100644 +--- a/config.layout ++++ b/config.layout +@@ -60,6 +60,23 @@ + runtimedir: ${localstatedir}/run + + ++# Haiku Layout making use of finddir ++ ++ prefix: /boot/system ++ exec_prefix: /boot/system ++ bindir: /boot/system/bin ++ sbindir: /boot/system/servers ++ libdir: /boot/system/lib ++ libexecdir: /boot/system/servers ++ mandir: /boot/system/documentation/man ++ sysconfdir: /boot/system/settings ++ datadir: /boot/system/data ++ installbuilddir: /boot/system/develop/build ++ includedir: /boot/system/include ++ localstatedir: /boot/system/var ++ runtimedir: ${localstatedir}/log ++ ++ + # Mac OS X Server (Rhapsody) + + prefix: /Local/Library/WebServer +-- +2.12.2 +