haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-04-23 20:20:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fixed the libtool issue with building apr-1.4.2.

Browse Source
This commit is contained in:
Scott McCreary
2010-10-13 02:51:06 +00:00
parent 3507d20a9d
commit e99fa02d4a
2 changed files with 24 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
dev-libs/apr/apr-1.4.2.bep
View File

@@ -7,13 +7,11 @@ STATUS_HAIKU="stable"
DEPEND=""
BUILD {
cd apr-1.4.2
# Why is this demanding to have libtool in / ?????
ln -sf /boot/common/libtool /libtool
# symlink it for now to make it happy
libtoolize --force --copy --install
touch libtool.m4
./buildconf
aclocal -I build
autoconf
./configure --prefix=`finddir B_COMMON_DIRECTORY`
make
}
@@ -22,5 +20,11 @@ INSTALL {
cd apr-1.4.2
make install
}
TEST {
cd apr-1.4.2
make test
}
LICENSE="Apache v2"
COPYRIGHT="2010 The Apache Software Foundation."

29
dev-libs/apr/patches/apr-1.4.2.patch
View File

@@ -1,6 +1,6 @@
diff -urN apr-1.4.2/build/apr_hints.m4 apr-1.4.2-haiku/build/apr_hints.m4
--- apr-1.4.2/build/apr_hints.m4 2009-11-17 14:28:12.000000000 +0000
+++ apr-1.4.2-haiku/build/apr_hints.m4 2010-10-11 12:00:01.350486528 +0000
--- apr-1.4.2/build/apr_hints.m4 2009-11-17 14:28:12.036700160 +0000
+++ apr-1.4.2-haiku/build/apr_hints.m4 2010-10-13 02:38:51.257687552 +0000
@@ -35,7 +35,7 @@
dnl Generally, we force the setting of CC, and add flags
dnl to CFLAGS, CPPFLAGS, LIBS and LDFLAGS.
@@ -33,8 +33,8 @@ diff -urN apr-1.4.2/build/apr_hints.m4 apr-1.4.2-haiku/build/apr_hints.m4
*-apple-aux3*)
APR_SETIFNULL(CC, [gcc])
diff -urN apr-1.4.2/build/apr_network.m4 apr-1.4.2-haiku/build/apr_network.m4
--- apr-1.4.2/build/apr_network.m4 2008-06-16 21:15:24.000000000 +0000
+++ apr-1.4.2-haiku/build/apr_network.m4 2010-10-11 12:00:01.367263744 +0000
--- apr-1.4.2/build/apr_network.m4 2008-06-16 21:15:24.035913728 +0000
+++ apr-1.4.2-haiku/build/apr_network.m4 2010-10-13 02:38:51.267911168 +0000
@@ -21,7 +21,7 @@
dnl
dnl check for type in_addr
@@ -45,8 +45,8 @@ diff -urN apr-1.4.2/build/apr_network.m4 apr-1.4.2-haiku/build/apr_network.m4
AC_TRY_COMPILE([
#ifdef HAVE_SYS_TYPES_H
diff -urN apr-1.4.2/build/apr_threads.m4 apr-1.4.2-haiku/build/apr_threads.m4
--- apr-1.4.2/build/apr_threads.m4 2006-08-03 10:46:47.000000000 +0000
+++ apr-1.4.2-haiku/build/apr_threads.m4 2010-10-11 12:00:01.377225216 +0000
--- apr-1.4.2/build/apr_threads.m4 2006-08-03 10:46:47.037748736 +0000
+++ apr-1.4.2-haiku/build/apr_threads.m4 2010-10-13 02:38:51.269221888 +0000
@@ -26,7 +26,7 @@
dnl pthreads is not available.
dnl Turn off warnings if we're using gcc.
@@ -99,8 +99,8 @@ diff -urN apr-1.4.2/build/apr_threads.m4 apr-1.4.2-haiku/build/apr_threads.m4
LIBS="$apr_pthsv_LIBS"
])dnl
diff -urN apr-1.4.2/build/gen-build.py apr-1.4.2-haiku/build/gen-build.py
--- apr-1.4.2/build/gen-build.py 2007-02-28 12:44:52.000000000 +0000
+++ apr-1.4.2-haiku/build/gen-build.py 2010-10-11 12:00:01.381419520 +0000
--- apr-1.4.2/build/gen-build.py 2007-02-28 12:44:52.034603008 +0000
+++ apr-1.4.2-haiku/build/gen-build.py 2010-10-13 02:38:51.278659072 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/bin/env python
@@ -108,8 +108,8 @@ diff -urN apr-1.4.2/build/gen-build.py apr-1.4.2-haiku/build/gen-build.py
# USAGE: gen-build.py TYPE
#
diff -urN apr-1.4.2/configure.in apr-1.4.2-haiku/configure.in
--- apr-1.4.2/configure.in 2009-11-16 07:45:28.000000000 +0000
+++ apr-1.4.2-haiku/configure.in 2010-10-11 12:00:01.412352512 +0000
--- apr-1.4.2/configure.in 2009-11-16 07:45:28.006291456 +0000
+++ apr-1.4.2-haiku/configure.in 2010-10-13 02:36:44.000000000 +0000
@@ -143,7 +143,7 @@
AC_PROG_CPP
AC_PROG_AWK
@@ -128,7 +128,7 @@ diff -urN apr-1.4.2/configure.in apr-1.4.2-haiku/configure.in
if test "$ac_test_CFLAGS" != set; then
APR_REMOVEFROM(CFLAGS,-g)
fi
@@ -498,6 +498,12 @@
@@ -498,6 +498,13 @@
OSDIR="unix"
eolstr="\\n"
;;
@@ -137,11 +137,12 @@ diff -urN apr-1.4.2/configure.in apr-1.4.2-haiku/configure.in
+ eolstr="\\n"
+ AC_CHECK_LIB(bsd, getpass)
+ AC_CHECK_LIB(network, socket)
+ LIBTOOL="./libtool"
+ ;;
*)
OSDIR="unix"
eolstr="\\n"
@@ -1099,6 +1105,10 @@
@@ -1099,6 +1106,10 @@
havemmapzero="0"
havemmapanon="0"
APR_BEGIN_DECISION([anonymous shared memory allocation method])
@@ -152,7 +153,7 @@ diff -urN apr-1.4.2/configure.in apr-1.4.2-haiku/configure.in
APR_IFALLYES(header:sys/ipc.h header:sys/shm.h header:sys/file.h dnl
func:shmget func:shmat func:shmdt func:shmctl,
[haveshmgetanon="1"
@@ -1170,6 +1180,9 @@
@@ -1170,6 +1181,9 @@
haveos2shm="0"
havewin32shm="0"
APR_BEGIN_DECISION([namebased memory allocation method])
@@ -162,7 +163,7 @@ diff -urN apr-1.4.2/configure.in apr-1.4.2-haiku/configure.in
APR_IFALLYES(header:sys/mman.h func:mmap func:munmap,
[havemmaptmp="1"
APR_DECIDE(USE_SHMEM_MMAP_TMP,
@@ -1183,9 +1196,6 @@
@@ -1183,9 +1197,6 @@
func:shmget func:shmat func:shmdt func:shmctl,
[haveshmget="1"
APR_DECIDE(USE_SHMEM_SHMGET, [SysV IPC shmget()])])