summaryrefslogtreecommitdiffstats
path: root/meta/packages
diff options
context:
space:
mode:
Diffstat (limited to 'meta/packages')
-rw-r--r--meta/packages/apr/apr-util/configure_fixes.patch27
-rw-r--r--meta/packages/apr/apr-util/configure_fixes.patch.old25
-rw-r--r--meta/packages/apr/apr-util_1.3.4.bb26
-rw-r--r--meta/packages/apr/apr/configure_fixes.patch66
-rw-r--r--meta/packages/apr/apr_1.3.3.bb30
-rw-r--r--meta/packages/subversion/files/disable-revision-install.patch22
-rw-r--r--meta/packages/subversion/files/libtool2.patch17
-rw-r--r--meta/packages/subversion/files/neon-detection.patch36
-rw-r--r--meta/packages/subversion/subversion_1.4.5.bb29
9 files changed, 278 insertions, 0 deletions
diff --git a/meta/packages/apr/apr-util/configure_fixes.patch b/meta/packages/apr/apr-util/configure_fixes.patch
new file mode 100644
index 0000000000..0b2a0903e1
--- /dev/null
+++ b/meta/packages/apr/apr-util/configure_fixes.patch
@@ -0,0 +1,27 @@
1Index: apr-util-1.3.4/configure.in
2===================================================================
3--- apr-util-1.3.4.orig/configure.in
4+++ apr-util-1.3.4/configure.in
5@@ -8,14 +8,14 @@ AC_INIT(export_vars.sh.in)
6 AC_CONFIG_HEADER(include/private/apu_config.h)
7 AC_CONFIG_AUX_DIR(build)
8
9-sinclude(build/apu-conf.m4)
10-sinclude(build/apu-iconv.m4)
11-sinclude(build/apu-hints.m4)
12-sinclude(build/apr_common.m4)
13-sinclude(build/find_apr.m4)
14-sinclude(build/dbm.m4)
15-sinclude(build/dbd.m4)
16-sinclude(build/dso.m4)
17+#sinclude(build/apu-conf.m4)
18+#sinclude(build/apu-iconv.m4)
19+#sinclude(build/apu-hints.m4)
20+#sinclude(build/apr_common.m4)
21+#sinclude(build/find_apr.m4)
22+#sinclude(build/dbm.m4)
23+#sinclude(build/dbd.m4)
24+#sinclude(build/dso.m4)
25
26 dnl Generate ./config.nice for reproducing runs of configure
27 dnl
diff --git a/meta/packages/apr/apr-util/configure_fixes.patch.old b/meta/packages/apr/apr-util/configure_fixes.patch.old
new file mode 100644
index 0000000000..16f88b3bba
--- /dev/null
+++ b/meta/packages/apr/apr-util/configure_fixes.patch.old
@@ -0,0 +1,25 @@
1Index: apr-util-1.2.12/configure.in
2===================================================================
3--- apr-util-1.2.12.orig/configure.in 2008-03-08 19:15:00.000000000 +0000
4+++ apr-util-1.2.12/configure.in 2008-03-08 19:15:13.000000000 +0000
5@@ -8,13 +8,13 @@
6 AC_CONFIG_HEADER(include/private/apu_config.h)
7 AC_CONFIG_AUX_DIR(build)
8
9-sinclude(build/apu-conf.m4)
10-sinclude(build/apu-iconv.m4)
11-sinclude(build/apu-hints.m4)
12-sinclude(build/apr_common.m4)
13-sinclude(build/find_apr.m4)
14-sinclude(build/dbm.m4)
15-sinclude(build/dbd.m4)
16+#sinclude(build/apu-conf.m4)
17+#sinclude(build/apu-iconv.m4)
18+#sinclude(build/apu-hints.m4)
19+#sinclude(build/apr_common.m4)
20+#sinclude(build/find_apr.m4)
21+#sinclude(build/dbm.m4)
22+#sinclude(build/dbd.m4)
23
24 dnl Generate ./config.nice for reproducing runs of configure
25 dnl
diff --git a/meta/packages/apr/apr-util_1.3.4.bb b/meta/packages/apr/apr-util_1.3.4.bb
new file mode 100644
index 0000000000..590c22e882
--- /dev/null
+++ b/meta/packages/apr/apr-util_1.3.4.bb
@@ -0,0 +1,26 @@
1DESCRIPTION = "Apache Portable Runtime (APR) companion library"
2SECTION = "libs"
3DEPENDS = "apr expat gdbm"
4LICENSE = "Apache License, Version 2.0"
5
6PR = "r2"
7
8SRC_URI = "${APACHE_MIRROR}/apr/${P}.tar.gz \
9 file://configure_fixes.patch;patch=1"
10
11EXTRA_OECONF = "--with-apr=${STAGING_BINDIR_CROSS}/apr-1-config \
12 --with-dbm=gdbm \
13 --with-gdbm=${STAGING_DIR_HOST}${layout_prefix} \
14 --without-sqlite2 \
15 --without-sqlite3 \
16 --with-expat=${STAGING_DIR_HOST}${layout_prefix}"
17
18
19inherit autotools_stage lib_package binconfig
20
21OE_BINCONFIG_EXTRA_MANGLE = " -e 's:location=source:location=installed:'"
22
23do_configure_prepend() {
24 cp ${STAGING_DATADIR}/apr/apr_rules.mk ${S}/build/rules.mk
25}
26
diff --git a/meta/packages/apr/apr/configure_fixes.patch b/meta/packages/apr/apr/configure_fixes.patch
new file mode 100644
index 0000000000..86ceb8cf08
--- /dev/null
+++ b/meta/packages/apr/apr/configure_fixes.patch
@@ -0,0 +1,66 @@
1Index: apr-1.3.3/configure.in
2===================================================================
3--- apr-1.3.3.orig/configure.in
4+++ apr-1.3.3/configure.in
5@@ -794,39 +794,6 @@ AC_CHECK_FUNCS([mmap munmap shm_open shm
6 create_area])
7
8 APR_CHECK_DEFINE(MAP_ANON, sys/mman.h)
9-AC_CHECK_FILE(/dev/zero)
10-
11-# Not all systems can mmap /dev/zero (such as HP-UX). Check for that.
12-if test "$ac_cv_func_mmap" = "yes" &&
13- test "$ac_cv_file__dev_zero" = "yes"; then
14- AC_MSG_CHECKING(for mmap that can map /dev/zero)
15- AC_TRY_RUN([
16-#include <sys/types.h>
17-#include <sys/stat.h>
18-#include <fcntl.h>
19-#ifdef HAVE_SYS_MMAN_H
20-#include <sys/mman.h>
21-#endif
22- int main()
23- {
24- int fd;
25- void *m;
26- fd = open("/dev/zero", O_RDWR);
27- if (fd < 0) {
28- return 1;
29- }
30- m = mmap(0, sizeof(void*), PROT_READ|PROT_WRITE, MAP_SHARED, fd, 0);
31- if (m == (void *)-1) { /* aka MAP_FAILED */
32- return 2;
33- }
34- if (munmap(m, sizeof(void*)) < 0) {
35- return 3;
36- }
37- return 0;
38- }], [], [ac_cv_file__dev_zero=no], [ac_cv_file__dev_zero=no])
39-
40- AC_MSG_RESULT($ac_cv_file__dev_zero)
41-fi
42
43 # Now we determine which one is our anonymous shmem preference.
44 haveshmgetanon="0"
45@@ -1518,13 +1485,14 @@ else
46 bigendian=0
47 fi
48
49-APR_CHECK_SIZEOF_EXTENDED([#include <sys/types.h>
50-#include <sys/uio.h>],struct iovec,0)
51-if test "$ac_cv_sizeof_struct_iovec" = "0"; then
52- have_iovec=0
53-else
54- have_iovec=1
55-fi
56+#APR_CHECK_SIZEOF_EXTENDED([#include <sys/types.h>
57+##include <sys/uio.h>],struct iovec,0)
58+#if test "$ac_cv_sizeof_struct_iovec" = "0"; then
59+# have_iovec=0
60+#else
61+# have_iovec=1
62+#fi
63+have_iovec=1
64
65 AC_SUBST(voidp_size)
66 AC_SUBST(short_value)
diff --git a/meta/packages/apr/apr_1.3.3.bb b/meta/packages/apr/apr_1.3.3.bb
new file mode 100644
index 0000000000..3e23bcd878
--- /dev/null
+++ b/meta/packages/apr/apr_1.3.3.bb
@@ -0,0 +1,30 @@
1DESCRIPTION = "Apache Portable Runtime (APR) library"
2SECTION = "libs"
3LICENSE = "Apache License, Version 2.0"
4
5PR = "r0"
6
7SRC_URI = "${APACHE_MIRROR}/apr/${P}.tar.bz2 \
8 file://configure_fixes.patch;patch=1"
9
10inherit autotools lib_package binconfig
11
12OE_BINCONFIG_EXTRA_MANGLE = " -e 's:location=source:location=installed:'"
13
14do_configure_prepend() {
15 cd ${S}
16 ./buildconf
17}
18
19do_stage() {
20 autotools_stage_all
21 install -d ${STAGING_DATADIR}/apr
22 cp ${S}/build/apr_rules.mk ${STAGING_DATADIR}/apr/
23 sed -i s,apr_builddir=.*,apr_builddir=,g ${STAGING_DATADIR}/apr/apr_rules.mk
24 sed -i s,apr_builders=.*,apr_builders=,g ${STAGING_DATADIR}/apr/apr_rules.mk
25 sed -i s,LIBTOOL=.*,LIBTOOL=\$\(SHELL\)\ ${TARGET_PREFIX}libtool,g ${STAGING_DATADIR}/apr/apr_rules.mk
26 sed -i s,\$\(apr_builders\),${STAGING_DATADIR}/apr/,g ${STAGING_DATADIR}/apr/apr_rules.mk
27 cp ${S}/build/mkdir.sh ${STAGING_DATADIR}/apr/
28 cp ${S}/build/make_exports.awk ${STAGING_DATADIR}/apr/
29 cp ${S}/build/make_var_export.awk ${STAGING_DATADIR}/apr/
30}
diff --git a/meta/packages/subversion/files/disable-revision-install.patch b/meta/packages/subversion/files/disable-revision-install.patch
new file mode 100644
index 0000000000..a1c60654cb
--- /dev/null
+++ b/meta/packages/subversion/files/disable-revision-install.patch
@@ -0,0 +1,22 @@
1--- subversion-1.2.0-r0/Makefile.in.old 2005-07-17 22:28:21.898728312 +0200
2+++ subversion-1.2.0-r0/Makefile.in 2005-07-17 22:30:05.361999504 +0200
3@@ -260,7 +260,7 @@
4 clean: external-clean local-clean
5 distclean: external-distclean local-distclean
6 extraclean: external-extraclean local-extraclean
7-install: external-install local-install revision-install
8+install: external-install local-install #revision-install
9
10 @INCLUDE_OUTPUTS@
11
12@@ -320,8 +320,8 @@
13 local-install: @INSTALL_RULES@
14
15 ### HACK!! Find a better way to do this
16-revision-install:
17- subversion/svnversion/svnversion $(top_srcdir) /repos/svn/trunk > $(DESTDIR)$(includedir)/subversion-1/svn-revision.txt
18+#revision-install:
19+# subversion/svnversion/svnversion $(top_srcdir) /repos/svn/trunk > $(DESTDIR)$(includedir)/subversion-1/svn-revision.txt
20
21 install-static: @INSTALL_STATIC_RULES@
22
diff --git a/meta/packages/subversion/files/libtool2.patch b/meta/packages/subversion/files/libtool2.patch
new file mode 100644
index 0000000000..a0163fd7f5
--- /dev/null
+++ b/meta/packages/subversion/files/libtool2.patch
@@ -0,0 +1,17 @@
1Index: subversion-1.4.5/configure.in
2===================================================================
3--- subversion-1.4.5.orig/configure.in 2009-01-07 17:10:41.000000000 +0000
4+++ subversion-1.4.5/configure.in 2009-01-07 17:13:32.000000000 +0000
5@@ -138,10 +138,10 @@
6 echo "using APR's libtool"
7 sh_libtool="`$apr_config --apr-libtool`"
8 LIBTOOL="$sh_libtool"
9 SVN_LIBTOOL="$sh_libtool"
10 else
11- sh_libtool="$abs_builddir/libtool"
12- SVN_LIBTOOL="\$(SHELL) $sh_libtool"
13+ sh_libtool="$abs_builddir/$host_alias-libtool"
14+ SVN_LIBTOOL="\$(abs_builddir)/$host_alias-libtool"
15 dnl libtoolize requires that the following line not be indented
16 AC_PROG_LIBTOOL
17 fi
diff --git a/meta/packages/subversion/files/neon-detection.patch b/meta/packages/subversion/files/neon-detection.patch
new file mode 100644
index 0000000000..b567d5c050
--- /dev/null
+++ b/meta/packages/subversion/files/neon-detection.patch
@@ -0,0 +1,36 @@
1diff --git a/build/ac-macros/neon.m4 b/build/ac-macros/neon.m4
2index 9fcf859..8d964f3 100644
3--- a/build/ac-macros/neon.m4
4+++ b/build/ac-macros/neon.m4
5@@ -38,7 +38,7 @@ AC_DEFUN(SVN_LIB_NEON,
6 if test "$withval" = "yes" ; then
7 AC_MSG_ERROR([--with-neon requires an argument.])
8 else
9- neon_config="$withval/bin/neon-config"
10+ neon_config="env env PKG_CONFIG_PATH=${withval}:${PKG_CONFIG_PATH} pkg-config neon"
11 fi
12
13 SVN_NEON_CONFIG()
14@@ -117,10 +117,10 @@ dnl SVN_NEON_CONFIG()
15 dnl neon-config found, gather relevant information from it
16 AC_DEFUN(SVN_NEON_CONFIG,
17 [
18- if test -f "$neon_config"; then
19- if test "$neon_config" != ""; then
20+ if true; then
21+ if true; then
22 AC_MSG_CHECKING([neon library version])
23- NEON_VERSION=`$neon_config --version | sed -e 's/^neon //'`
24+ NEON_VERSION=`$neon_config --modversion | sed -e 's/^neon //'`
25 AC_MSG_RESULT([$NEON_VERSION])
26
27 if test -n "`echo \"$NEON_VERSION\" | grep '^0\.25\.'`" ; then
28@@ -133,7 +133,7 @@ AC_DEFUN(SVN_NEON_CONFIG,
29 test "$svn_allowed_neon" = "any"; then
30 svn_allowed_neon_on_system="yes"
31 SVN_NEON_INCLUDES=[`$neon_config --cflags | sed -e 's/-D[^ ]*//g'`]
32- NEON_LIBS=`$neon_config --la-file`
33+ NEON_LIBS=`$neon_config --libs`
34 CFLAGS=["$CFLAGS `$neon_config --cflags | sed -e 's/-I[^ ]*//g'`"]
35 svn_lib_neon="yes"
36 break
diff --git a/meta/packages/subversion/subversion_1.4.5.bb b/meta/packages/subversion/subversion_1.4.5.bb
new file mode 100644
index 0000000000..40ba53e813
--- /dev/null
+++ b/meta/packages/subversion/subversion_1.4.5.bb
@@ -0,0 +1,29 @@
1DESCRIPTION = "The Subversion (svn) client"
2SECTION = "console/network"
3DEPENDS = "apr-util neon"
4RDEPENDS = "neon"
5LICENSE = "Apache BSD"
6HOMEPAGE = "http://subversion.tigris.org"
7
8PR = "r1"
9
10SRC_URI = "http://subversion.tigris.org/downloads/${P}.tar.bz2 \
11 file://disable-revision-install.patch;patch=1 \
12 file://neon-detection.patch;patch=1 \
13 file://libtool2.patch;patch=1"
14
15EXTRA_OECONF = "--with-neon=${STAGING_EXECPREFIXDIR} \
16 --without-berkeley-db --without-apxs --without-apache \
17 --without-swig --with-apr=${STAGING_BINDIR_CROSS} \
18 --with-apr-util=${STAGING_BINDIR_CROSS}"
19
20inherit autotools_stage
21
22export LDFLAGS += " -L${STAGING_LIBDIR} "
23
24acpaths = "-I build/ -I build/ac-macros/"
25
26do_configure_prepend () {
27 rm -f ${S}/libtool
28 rm -f ${S}/build/libtool.m4
29}
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-16 09:53:17 +0000