-
Notifications
You must be signed in to change notification settings - Fork 127
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote branch 'origin/org.openembedded.dev' into shr/merge
- Loading branch information
Showing
64 changed files
with
4,649 additions
and
293 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,10 @@ | ||
| --- httpd-2.2.3/srclib/apr/network_io/unix/sockets.c.orig | ||
| +++ httpd-2.2.3/srclib/apr/network_io/unix/sockets.c | ||
| @@ -231,6 +231,7 @@ | ||
| #if APR_O_NONBLOCK_INHERITED | ||
| if (apr_is_option_set(sock, APR_SO_NONBLOCK) == 1) { | ||
| apr_set_option(*new, APR_SO_NONBLOCK, 1); | ||
| + apr_socket_opt_set(*new, APR_SO_NONBLOCK, 0); | ||
| } | ||
| #endif /* APR_O_NONBLOCK_INHERITED */ | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,13 @@ | ||
| Index: httpd-2.2.14/srclib/apr/include/apr.h.in | ||
| =================================================================== | ||
| --- httpd-2.2.14.orig/srclib/apr/include/apr.h.in | ||
| +++ httpd-2.2.14/srclib/apr/include/apr.h.in | ||
| @@ -224,7 +224,7 @@ extern "C" { | ||
| #define APR_HAVE_STRUCT_RLIMIT @struct_rlimit@ | ||
| #define APR_HAVE_UNION_SEMUN @have_union_semun@ | ||
| #define APR_HAVE_SCTP @have_sctp@ | ||
| -#define APR_HAVE_IOVEC @have_iovec@ | ||
| +#define APR_HAVE_IOVEC 1 | ||
|
|
||
| /* APR Feature Macros */ | ||
| #define APR_HAS_SHARED_MEMORY @sharedmem@ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,71 @@ | ||
| Index: httpd-2.2.14/configure | ||
| =================================================================== | ||
| --- httpd-2.2.14.orig/configure | ||
| +++ httpd-2.2.14/configure | ||
| @@ -3795,26 +3795,6 @@ if test "${with_apr+set}" = set; then : | ||
|
|
||
| else | ||
|
|
||
| - if test -n "1" && test "1" = "1"; then | ||
| - for apr_temp_apr_config_file in $apr_temp_acceptable_apr_config | ||
| - do | ||
| - if $apr_temp_apr_config_file --help > /dev/null 2>&1 ; then | ||
| - apr_config="$apr_temp_apr_config_file" | ||
| - | ||
| - apr_found="yes" | ||
| - break | ||
| - else | ||
| - for lookdir in /usr /usr/local /usr/local/apr /opt/apr; do | ||
| - if $TEST_X "$lookdir/bin/$apr_temp_apr_config_file"; then | ||
| - apr_config="$lookdir/bin/$apr_temp_apr_config_file" | ||
| - | ||
| - apr_found="yes" | ||
| - break 2 | ||
| - fi | ||
| - done | ||
| - fi | ||
| - done | ||
| - fi | ||
| if test "$apr_found" = "no" && test -d ""$srcdir/srclib/apr""; then | ||
| apr_temp_abs_srcdir="`cd "$srcdir/srclib/apr" && pwd`" | ||
| apr_found="reconfig" | ||
| @@ -4147,26 +4127,6 @@ if test "${with_apr_util+set}" = set; th | ||
|
|
||
| else | ||
|
|
||
| - if test -n "1" && test "1" = "1"; then | ||
| - for apu_temp_apu_config_file in $apu_temp_acceptable_apu_config | ||
| - do | ||
| - if $apu_temp_apu_config_file --help > /dev/null 2>&1 ; then | ||
| - apu_config="$apu_temp_apu_config_file" | ||
| - | ||
| - apu_found="yes" | ||
| - break | ||
| - else | ||
| - for lookdir in /usr /usr/local /usr/local/apr /opt/apr; do | ||
| - if $TEST_X "$lookdir/bin/$apu_temp_apu_config_file"; then | ||
| - apu_config="$lookdir/bin/$apu_temp_apu_config_file" | ||
| - | ||
| - apu_found="yes" | ||
| - break 2 | ||
| - fi | ||
| - done | ||
| - fi | ||
| - done | ||
| - fi | ||
| if test "$apu_found" = "no" && test -d ""$srcdir/srclib/apr-util""; then | ||
| apu_temp_abs_srcdir="`cd "$srcdir/srclib/apr-util" && pwd`" | ||
| apu_found="reconfig" | ||
| @@ -7045,7 +7005,11 @@ if test "${ap_cv_void_ptr_lt_long+set}" | ||
| $as_echo_n "(cached) " >&6 | ||
| else | ||
| if test "$cross_compiling" = yes; then : | ||
| - ap_cv_void_ptr_lt_long=yes | ||
| + if test "$ac_cv_sizeof_long_p" = "$ac_cv_sizeof_void_p"; then | ||
| + ap_void_ptr_lt_long=no | ||
| + else | ||
| + ap_void_ptr_lt_long=yes | ||
| + fi | ||
| else | ||
| cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
| /* end confdefs.h. */ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,27 @@ | ||
| Index: httpd-2.2.14/srclib/apr/configure.in | ||
| =================================================================== | ||
| --- httpd-2.2.14.orig/srclib/apr/configure.in | ||
| +++ httpd-2.2.14/srclib/apr/configure.in | ||
| @@ -923,7 +923,7 @@ AC_CHECK_FUNCS([mmap munmap shm_open shm | ||
| create_area]) | ||
|
|
||
| APR_CHECK_DEFINE(MAP_ANON, sys/mman.h) | ||
| -AC_CHECK_FILE(/dev/zero) | ||
| +APR_CHECK_FILE(/dev/zero) | ||
|
|
||
| # Not all systems can mmap /dev/zero (such as HP-UX). Check for that. | ||
| if test "$ac_cv_func_mmap" = "yes" && | ||
| Index: httpd-2.2.14/configure.in | ||
| =================================================================== | ||
| --- httpd-2.2.14.orig/configure.in | ||
| +++ httpd-2.2.14/configure.in | ||
| @@ -61,6 +61,9 @@ APR_MKDIR_P_CHECK($top_srcdir/build/mkdi | ||
|
|
||
| dnl ## Run configure for packages Apache uses | ||
|
|
||
| +dnl first configure subdirs | ||
| +AC_CONFIG_SUBDIRS(srclib/apr srclib/apr-util srclib/prce) | ||
| + | ||
| dnl shared library support for these packages doesn't currently | ||
| dnl work on some platforms | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,10 @@ | ||
| --- http-2.2.3/srclib/pcre/Makefile.in-orig | ||
| +++ http-2.2.3/srclib/pcre/Makefile.in 2005-12-20 13:12:03.000000000 -0500 | ||
| @@ -15,6 +15,6 @@ | ||
| $(LINK) $(EXTRA_LDFLAGS) dftables.lo $(EXTRA_LIBS) | ||
|
|
||
| $(srcdir)/chartables.c: dftables | ||
| - ./dftables $@ | ||
| + dftables $@ | ||
|
|
||
| pcre.lo: $(srcdir)/chartables.c |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,11 @@ | ||
| --- http-2.0.54/server/Makefile.in-old 2005-12-20 13:26:56.000000000 -0500 | ||
| +++ http-2.0.54/server/Makefile.in 2005-12-20 13:27:22.000000000 -0500 | ||
| @@ -27,7 +27,7 @@ | ||
| $(LINK) $(EXTRA_LDFLAGS) $(gen_test_char_OBJECTS) $(EXTRA_LIBS) | ||
|
|
||
| test_char.h: gen_test_char | ||
| - ./gen_test_char > test_char.h | ||
| + gen_test_char > test_char.h | ||
|
|
||
| util.lo: test_char.h | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,40 @@ | ||
| SECTION = "net" | ||
| DEPENDS = "expat pcre" | ||
|
|
||
| inherit native | ||
|
|
||
| PR ="r0" | ||
| SRC_URI = "http://www.apache.org/dist/httpd/httpd-${PV}.tar.bz2" | ||
|
|
||
| S = "${WORKDIR}/httpd-${PV}" | ||
|
|
||
| do_configure () { | ||
| ./configure --with-included-apr --prefix=${prefix} | ||
| } | ||
|
|
||
| do_stage () { | ||
| install -d ${STAGING_BINDIR_NATIVE} | ||
| cp srclib/pcre/dftables ${STAGING_BINDIR_NATIVE} | ||
| cp server/gen_test_char ${STAGING_BINDIR_NATIVE} | ||
| cp srclib/apr/apr-1-config ${STAGING_BINDIR_NATIVE} | ||
| cp srclib/apr-util/apu-1-config ${STAGING_BINDIR_NATIVE} | ||
| cp support/apxs ${STAGING_BINDIR_NATIVE} | ||
| chmod 755 ${STAGING_BINDIR_NATIVE}/apxs | ||
| mkdir -p ${STAGING_DIR_NATIVE}//usr/build | ||
| cp build/*.mk ${STAGING_DIR_NATIVE}/usr/build | ||
| cp build/instdso.sh ${STAGING_DIR_NATIVE}/usr/build | ||
| cp .libs/httpd ${STAGING_BINDIR_NATIVE} | ||
|
|
||
| (cd srclib/apr/.libs; tar -cf - libapr-*.so* ) | | ||
| (cd ${STAGING_LIBDIR_NATIVE}; tar -xf - ) | ||
| (cd srclib/apr-util/.libs; tar -cf - libaprutil-*.so* ) | | ||
| (cd ${STAGING_LIBDIR_NATIVE}; tar -xf - ) | ||
|
|
||
| mkdir -p ${STAGING_INCDIR_NATIVE}/apache2 | ||
| cp include/* ${STAGING_INCDIR_NATIVE}/apache2 | ||
| cp os/unix/os.h ${STAGING_INCDIR_NATIVE}/apache2 | ||
| cp os/unix/unixd.h ${STAGING_INCDIR_NATIVE}/apache2 | ||
|
|
||
| cp support/envvars-std ${STAGING_BINDIR_NATIVE}/envvars | ||
| chmod 755 ${STAGING_BINDIR_NATIVE}/envvars | ||
| } |
Oops, something went wrong.