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

apr: bump version.

Browse Source 
enable x86.
This commit is contained in:
Jerome Duval
2019-11-24 18:54:47 +01:00
parent a1264f955e
commit be8d7443c7
10 changed files with 5 additions and 576 deletions
Download Patch File Download Diff File Expand all files Collapse all files

108
dev-libs/apr/apr-1.4.6.recipe
View File

@@ -1,108 +0,0 @@
SUMMARY="Apache Portable Runtime Library"
HOMEPAGE="http://apr.apache.org/"
SOURCE_URI="http://archive.apache.org/dist/apr/apr-1.4.6.tar.gz"
CHECKSUM_SHA256="538d593d805c36985fc6d200d31bf6c1b5f90df2a50b917902743a13bbc10e05"
COPYRIGHT="2012 The Apache Software Foundation."
LICENSE="Apache v2"
REVISION="7"
ARCHITECTURES="x86_gcc2 x86 x86_64"
PATCHES="apr-1.4.6.patch"
PROVIDES="
apr = $portVersion compat >= 1
lib:libapr_1 = 0.4.6 compat >= 0
"
REQUIRES="
haiku
"
BUILD_REQUIRES="
"
BUILD_PREREQUIRES="
haiku_devel
cmd:aclocal
cmd:autoconf
cmd:gcc
cmd:ld
cmd:libtoolize
cmd:make
"
BUILD()
{
libtoolize -fci
touch libtool.m4
aclocal -I build
autoconf
runConfigure ./configure \
--with-installbuilddir=$prefix/data/apr
# TODO: fix this hack (by finding out why top_builddir seems to be unset)!
ln -sfn $sourceDir/libtool /libtool
make $jobArgs
}
INSTALL()
{
make install
# prepare develop/lib
prepareInstalledDevelLibs libapr-1
fixPkgconfig
# fix apr-1-config
fixDevelopLibDirReferences $binDir/apr-1-config
# remove superfluous .exp file
rm $libDir/apr.exp
# devel package
packageEntries devel \
$binDir \
$dataDir \
$developDir
}
TEST()
{
make test
}
# ----- description ----------------------------------------------------------
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.
To give a brief overview, the primary core subsystems of APR 1.x include the \
following:
- atomic operations
- dynamic Shared Object loading
- file I/O
- locks (mutexes, condition variables, etc)
- memory management (high performance allocators)
- memory-mapped files
- multicast Sockets
- network I/O
- shared memory
- thread and Process management
- various data structures (tables, hashes, priority queues, etc)
"
# ----- devel package -------------------------------------------------------
PROVIDES_devel="
apr_devel = portVersion compat >= 1
cmd:apr_1_config = portVersion compat >= 1
devel:libapr_1 = 0.4.6 compat >= 0
"
REQUIRES_devel="
apr == $portVersion base
"

106
dev-libs/apr/apr-1.5.2.recipe
View File

@@ -1,106 +0,0 @@
SUMMARY="Apache Portable Runtime 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.
To give a brief overview, the primary core subsystems of APR 1.x include the \
following:
- atomic operations
- dynamic shared object loading
- file I/O
- locks (mutexes, condition variables, etc.)
- memory management (high performance allocators)
- memory-mapped files
- multicast sockets
- network I/O
- shared memory
- thread and process management
- various data structures (tables, hashes, priority queues, etc.)"
HOMEPAGE="http://apr.apache.org/"
COPYRIGHT="2012 The Apache Software Foundation"
LICENSE="Apache v2"
REVISION="4"
SOURCE_URI="http://archive.apache.org/dist/apr/apr-$portVersion.tar.gz"
CHECKSUM_SHA256="1af06e1720a58851d90694a984af18355b65bb0d047be03ec7d659c746d6dbdb"
PATCHES="apr-$portVersion.patch"
ARCHITECTURES="x86_gcc2 x86 x86_64"
SECONDARY_ARCHITECTURES="x86"
PROVIDES="
apr$secondaryArchSuffix = $portVersion compat >= 1
lib:libapr_1$secondaryArchSuffix = 0.5.2 compat >= 0
"
REQUIRES="
haiku$secondaryArchSuffix
"
PROVIDES_devel="
apr${secondaryArchSuffix}_devel = portVersion compat >= 1
cmd:apr_1_config$secondaryArchSuffix = portVersion compat >= 1
devel:libapr_1$secondaryArchSuffix = 0.5.2 compat >= 0
"
REQUIRES_devel="
apr$secondaryArchSuffix == $portVersion base
"
BUILD_REQUIRES="
haiku${secondaryArchSuffix}_devel
"
BUILD_PREREQUIRES="
cmd:aclocal
cmd:autoconf
cmd:gcc$secondaryArchSuffix
cmd:ld$secondaryArchSuffix
cmd:libtoolize$secondaryArchSuffix
cmd:make
"
BUILD()
{
libtoolize -fci
touch libtool.m4
aclocal -I build
autoconf
runConfigure ./configure \
--with-installbuilddir=$prefix/data/apr CFLAGS=-D_BSD_SOURCE
# TODO: fix this hack (by finding out why top_builddir seems to be unset)!
ln -sfn $sourceDir/libtool /libtool
make $jobArgs
}
INSTALL()
{
make install
# remove libtool library file
rm $libDir/libapr-1.la
# prepare develop/lib
prepareInstalledDevelLibs libapr-1
fixPkgconfig
# fix apr-1-config
fixDevelopLibDirReferences $binDir/apr-1-config
# remove superfluous .exp file
rm $libDir/apr.exp
# devel package
packageEntries devel \
$binDir \
$dataDir \
$developDir
}
TEST()
{
make test
}

106
dev-libs/apr/apr-1.6.3.recipe
View File

@@ -1,106 +0,0 @@
SUMMARY="Apache Portable Runtime 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.
To give a brief overview, the primary core subsystems of APR 1.x include the \
following:
- atomic operations
- dynamic shared object loading
- file I/O
- locks (mutexes, condition variables, etc.)
- memory management (high performance allocators)
- memory-mapped files
- multicast sockets
- network I/O
- shared memory
- thread and process management
- various data structures (tables, hashes, priority queues, etc.)"
HOMEPAGE="http://apr.apache.org/"
COPYRIGHT="2012 The Apache Software Foundation"
LICENSE="Apache v2"
REVISION="1"
SOURCE_URI="http://archive.apache.org/dist/apr/apr-$portVersion.tar.gz"
CHECKSUM_SHA256="8fdabcc0004216c3588b7dca0f23d104dfe012a47e2bb6f13827534a6ee73aa7"
PATCHES="apr-$portVersion.patchset"
ARCHITECTURES="?x86_gcc2 ?x86 x86_64"
SECONDARY_ARCHITECTURES="?x86"
PROVIDES="
apr$secondaryArchSuffix = $portVersion
lib:libapr_1$secondaryArchSuffix = 0.6.3 compat >= 0
"
REQUIRES="
haiku$secondaryArchSuffix
"
PROVIDES_devel="
apr${secondaryArchSuffix}_devel = portVersion
cmd:apr_1_config$secondaryArchSuffix = portVersion compat >= 1
devel:libapr_1$secondaryArchSuffix = 0.6.3 compat >= 0
"
REQUIRES_devel="
apr$secondaryArchSuffix == $portVersion base
"
BUILD_REQUIRES="
haiku${secondaryArchSuffix}_devel
"
BUILD_PREREQUIRES="
cmd:aclocal
cmd:autoconf
cmd:gcc$secondaryArchSuffix
cmd:ld$secondaryArchSuffix
cmd:libtoolize$secondaryArchSuffix
cmd:make
"
BUILD()
{
libtoolize -fci
touch libtool.m4
aclocal -I build
autoconf
runConfigure ./configure \
--with-installbuilddir=$prefix/data/apr CFLAGS=-D_BSD_SOURCE
# TODO: fix this hack (by finding out why top_builddir seems to be unset)!
ln -sfn $sourceDir/libtool /libtool
make $jobArgs
}
INSTALL()
{
make install
# remove libtool library file
rm $libDir/libapr-1.la
# prepare develop/lib
prepareInstalledDevelLibs libapr-1
fixPkgconfig
# fix apr-1-config
fixDevelopLibDirReferences $binDir/apr-1-config
# remove superfluous .exp file
rm $libDir/apr.exp
# devel package
packageEntries devel \
$binDir \
$dataDir \
$developDir
}
TEST()
{
make test
}

11
dev-libs/apr/apr-1.6.5.recipe → dev-libs/apr/apr-1.7.0.recipe
View File

@@ -26,13 +26,13 @@ COPYRIGHT="2012 The Apache Software Foundation"
LICENSE="Apache v2"
REVISION="1"
SOURCE_URI="http://archive.apache.org/dist/apr/apr-$portVersion.tar.gz"
CHECKSUM_SHA256="70dcf9102066a2ff2ffc47e93c289c8e54c95d8dda23b503f9e61bb0cbd2d105"
CHECKSUM_SHA256="48e9dbf45ae3fdc7b491259ffb6ccf7d63049ffacbc1c0977cced095e4c2d5a2"
PATCHES="apr-$portVersion.patchset"
ARCHITECTURES="?x86_gcc2 ?x86 x86_64"
SECONDARY_ARCHITECTURES="?x86"
ARCHITECTURES="x86_gcc2 ?x86 x86_64"
SECONDARY_ARCHITECTURES="x86"
libVersion="0.6.5"
libVersion="0.7.0"
libVersionCompat="$libVersion compat >= ${libVersion%%.*}"
PROVIDES="
@@ -83,8 +83,7 @@ INSTALL()
{
make install
# remove libtool library file
rm $libDir/libapr-1.la
rm $libDir/libapr-1.la $libDir/libapr-1.a
# prepare develop/lib
prepareInstalledDevelLibs libapr-1

39
dev-libs/apr/patches/apr-1.4.4.patch
View File

@@ -1,39 +0,0 @@
diff -urN apr-1.4.4/config.layout apr-1.4.4-haiku/config.layout
--- apr-1.4.4/config.layout 2004-11-24 22:51:51.065798144 +0000
+++ apr-1.4.4-haiku/config.layout 2011-03-24 11:36:30.742653952 +0000
@@ -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
diff -urN apr-1.4.4/configure.in apr-1.4.4-haiku/configure.in
--- apr-1.4.4/configure.in 2009-11-16 07:45:28.064225280 +0000
+++ apr-1.4.4-haiku/configure.in 2011-03-24 14:27:40.000000000 +0000
@@ -143,7 +143,7 @@
AC_PROG_CPP
AC_PROG_AWK
AC_PROG_LN_S
-AC_PROG_RANLIB
+AC_PROG_LIBTOOL
AC_PROG_INSTALL
AC_CHECK_PROG(RM, rm, rm)
AC_CHECK_PROG(AS, as, as)

50
dev-libs/apr/patches/apr-1.4.5.patch
View File

@@ -1,50 +0,0 @@
diff -urN apr-1.4.5/config.layout apr-1.4.5-haiku/config.layout
--- apr-1.4.5/config.layout 2004-11-24 22:51:51.056360960 +0000
+++ apr-1.4.5-haiku/config.layout 2011-07-12 10:34:27.155189248 +0000
@@ -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
diff -urN apr-1.4.5/configure.in apr-1.4.5-haiku/configure.in
--- apr-1.4.5/configure.in 2011-04-11 12:58:38.043253760 -0700
+++ apr-1.4.5-haiku/configure.in 2011-08-02 12:49:33.801112064 -0700
@@ -204,7 +204,7 @@
AC_PROG_CPP
AC_PROG_AWK
AC_PROG_LN_S
-AC_PROG_RANLIB
+AC_PROG_LIBTOOL
AC_PROG_INSTALL
AC_CHECK_PROG(RM, rm, rm)
AC_CHECK_PROG(AS, as, as)
@@ -673,9 +673,9 @@
ac_cv_func_CreateFileMapping=yes
;;
*)
+ AC_SEARCH_LIBS(socket, socket network)
AC_SEARCH_LIBS(gethostbyname, nsl)
AC_SEARCH_LIBS(gethostname, nsl)
- AC_SEARCH_LIBS(socket, socket)
AC_SEARCH_LIBS(crypt, crypt ufc)
AC_CHECK_LIB(truerand, main)
AC_SEARCH_LIBS(modf, m)

50
dev-libs/apr/patches/apr-1.4.6.patch
View File

@@ -1,50 +0,0 @@
diff -urN apr-1.4.6/config.layout apr-1.4.6-haiku/config.layout
--- apr-1.4.6/config.layout 2004-11-24 22:51:51.056360960 +0000
+++ apr-1.4.6-haiku/config.layout 2011-07-12 10:34:27.155189248 +0000
@@ -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
diff -urN apr-1.4.6/configure.in apr-1.4.6-haiku/configure.in
--- apr-1.4.6/configure.in 2011-04-11 12:58:38.043253760 -0700
+++ apr-1.4.6-haiku/configure.in 2011-08-02 12:49:33.801112064 -0700
@@ -203,7 +203,7 @@
AC_PROG_CPP
AC_PROG_AWK
AC_PROG_LN_S
-AC_PROG_RANLIB
+AC_PROG_LIBTOOL
AC_PROG_INSTALL
AC_CHECK_PROG(RM, rm, rm)
AC_CHECK_PROG(AS, as, as)
@@ -672,9 +672,9 @@
ac_cv_func_CreateFileMapping=yes
;;
*)
+ AC_SEARCH_LIBS(socket, socket network)
AC_SEARCH_LIBS(gethostbyname, nsl)
AC_SEARCH_LIBS(gethostname, nsl)
- AC_SEARCH_LIBS(socket, socket)
AC_SEARCH_LIBS(crypt, crypt ufc)
AC_CHECK_LIB(truerand, main)
AC_SEARCH_LIBS(modf, m)

50
dev-libs/apr/patches/apr-1.5.2.patch
View File

@@ -1,50 +0,0 @@
diff -urN apr-1.4.6/config.layout apr-1.4.6-haiku/config.layout
--- apr-1.4.6/config.layout 2004-11-24 22:51:51.056360960 +0000
+++ apr-1.4.6-haiku/config.layout 2011-07-12 10:34:27.155189248 +0000
@@ -60,6 +60,23 @@
runtimedir: ${localstatedir}/run
</Layout>
+# Haiku Layout making use of finddir
+<Layout haiku>
+ 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/develop/build
+ includedir: /boot/system/include
+ localstatedir: /boot/system/var
+ runtimedir: ${localstatedir}/log
+</Layout>
+
# Mac OS X Server (Rhapsody)
<Layout Mac OS X Server>
prefix: /Local/Library/WebServer
diff -urN apr-1.4.6/configure.in apr-1.4.6-haiku/configure.in
--- apr-1.4.6/configure.in 2011-04-11 12:58:38.043253760 -0700
+++ apr-1.4.6-haiku/configure.in 2011-08-02 12:49:33.801112064 -0700
@@ -203,7 +203,7 @@
AC_PROG_CPP
AC_PROG_AWK
AC_PROG_LN_S
-AC_PROG_RANLIB
+AC_PROG_LIBTOOL
AC_PROG_INSTALL
AC_CHECK_PROG(RM, rm, rm)
AC_CHECK_PROG(AS, as, as)
@@ -672,9 +672,9 @@
ac_cv_func_CreateFileMapping=yes
;;
*)
+ AC_SEARCH_LIBS(socket, socket network)
AC_SEARCH_LIBS(gethostbyname, nsl)
AC_SEARCH_LIBS(gethostname, nsl)
- AC_SEARCH_LIBS(socket, socket)
AC_SEARCH_LIBS(crypt, crypt ufc)
AC_CHECK_LIB(truerand, main)
AC_SEARCH_LIBS(modf, m)

61
dev-libs/apr/patches/apr-1.6.5.patchset
View File

@@ -1,61 +0,0 @@
From 6face34a456517470d0d06ec1870dfd66b7342d2 Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Sat, 15 Jul 2017 13:50:02 +0200
Subject: apply 1.5.2 patch.
diff --git a/config.layout b/config.layout
index 0f42e84..2e29914 100644
--- a/config.layout
+++ b/config.layout
@@ -60,6 +60,23 @@
runtimedir: ${localstatedir}/run
</Layout>
+# Haiku Layout making use of finddir
+<Layout haiku>
+ 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/develop/build
+ includedir: /boot/system/include
+ localstatedir: /boot/system/var
+ runtimedir: ${localstatedir}/log
+</Layout>
+
# Mac OS X Server (Rhapsody)
<Layout Mac OS X Server>
prefix: /Local/Library/WebServer
diff --git a/configure.in b/configure.in
index 927e1e6..606ed16 100644
--- a/configure.in
+++ b/configure.in
@@ -203,7 +203,7 @@ AC_PROG_MAKE_SET
AC_PROG_CPP
AC_PROG_AWK
AC_PROG_LN_S
-AC_PROG_RANLIB
+AC_PROG_LIBTOOL
AC_PROG_INSTALL
AC_CHECK_PROG(RM, rm, rm)
AC_CHECK_PROG(AS, as, as)
@@ -718,9 +718,9 @@ case $host in
ac_cv_func_CreateFileMapping=yes
;;
*)
+ AC_SEARCH_LIBS(socket, socket network)
AC_SEARCH_LIBS(gethostbyname, nsl)
AC_SEARCH_LIBS(gethostname, nsl)
- AC_SEARCH_LIBS(socket, socket)
AC_SEARCH_LIBS(crypt, crypt ufc)
AC_CHECK_LIB(truerand, main)
AC_SEARCH_LIBS(modf, m)
--
2.12.2

0
dev-libs/apr/patches/apr-1.6.3.patchset → dev-libs/apr/patches/apr-1.7.0.patchset
View File