mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-15 08:10:07 +02:00
88cc2bcdb9
* Rename patch to match package name. * Specify patch explicitly. Previously patch wasn't picked up anymore due to its name not matching the package name. * Add cmd:apu_1_config to provides. * Move patch command from BUILD to PATCH. * Use runConfigure. * Use jobArgs. * Fix developLibDir paths in apu-1-config. * Patch build/apu-conf.m4 so the correct include and library path is used for expat. * Remove old patches.
46 lines
1.8 KiB
Diff
46 lines
1.8 KiB
Diff
diff -ur orig/apr-util-1.4.1/build/apu-conf.m4 apr_util-1.4.1/build/apu-conf.m4
|
|
--- orig/apr-util-1.4.1/build/apu-conf.m4 2011-08-08 11:32:27.026738688 +0200
|
|
+++ apr_util-1.4.1/build/apu-conf.m4 2013-04-30 21:28:37.100401152 +0200
|
|
@@ -145,10 +145,10 @@
|
|
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
|
|
# ...and refuse to fall back on the builtin expat.
|
|
apu_try_builtin_expat=0
|
|
diff -ur orig/apr-util-1.4.1/config.layout apr_util-1.4.1/config.layout
|
|
--- orig/apr-util-1.4.1/config.layout 2005-02-09 13:18:43.064749568 +0100
|
|
+++ apr_util-1.4.1/config.layout 2013-04-30 21:27:27.079953920 +0200
|
|
@@ -60,6 +60,23 @@
|
|
runtimedir: ${localstatedir}/run
|
|
</Layout>
|
|
|
|
+# Haiku Layout making use of finddir
|
|
+<Layout haiku>
|
|
+ prefix: /boot/common
|
|
+ exec_prefix: /boot/common
|
|
+ bindir: /boot/common/bin
|
|
+ sbindir: /boot/common/servers
|
|
+ libdir: /boot/common/lib
|
|
+ libexecdir: /boot/common/servers
|
|
+ mandir: /boot/common/documentation/man
|
|
+ sysconfdir: /boot/common/settings
|
|
+ datadir: /boot/common/data
|
|
+ installbuilddir: /boot/develop/build
|
|
+ includedir: /boot/common/include
|
|
+ localstatedir: /boot/common/var
|
|
+ runtimedir: ${localstatedir}/log
|
|
+</Layout>
|
|
+
|
|
# Mac OS X Server (Rhapsody)
|
|
<Layout Mac OS X Server>
|
|
prefix: /Local/Library/WebServer
|