| /trunk/debian/patches/unbreak_cross_compilation.dpatch |
|---|
| 0,0 → 1,46 |
| #! /bin/sh /usr/share/dpatch/dpatch-run |
| ## unbreak_cross_compiling.dpatch by Marc Dirix <marc@electronics-design.nl> |
| ## |
| ## DP: Fix various breakage preventing cross compilation: |
| ## DP: * Use the installed pike when needed, not the newly built one. |
| ## DP: * Don't disable dynamic module loading just because we're cross-compiling |
| ## DP: * Don't freak out because a test program cannot be run |
| @DPATCH@ |
| --- a/src/configure 2009-09-22 20:37:45.000000000 +0000 |
| +++ b/src/configure 2010-05-04 09:44:55.000000000 +0000 |
| @@ -8855,7 +8855,7 @@ |
| RUNTPIKE="USE_PIKE" |
| else |
| if test "x$cross_compiling" = "xyes"; then |
| - RUNPIKE="DEFAULT_RUNPIKE" |
| + RUNPIKE="USE_PIKE" |
| RUNTPIKE="USE_PIKE" |
| else |
| RUNPIKE="DEFAULT_RUNPIKE" |
| @@ -106926,7 +106926,7 @@ |
| ;; |
| esac |
| if test "$cross_compiling" = yes; then |
| - pike_cv_sys_dynamic_loading=no |
| + pike_cv_sys_dynamic_loading=yes |
| else |
| cat >conftest.$ac_ext <<_ACEOF |
| /* confdefs.h. */ |
| --- a/src/modules/Mysql/configure 2010-05-19 10:20:10.745552500 +0000 |
| +++ b/src/modules/Mysql/configure 2009-09-22 20:38:35.000000000 +0000 |
| @@ -7018,13 +7018,7 @@ |
| $as_echo "yes" >&6; } |
| if test "$cross_compiling" = yes; then |
| - { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 |
| -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} |
| -{ { $as_echo "$as_me:$LINENO: error: cannot run test program while cross compiling |
| -See \`config.log' for more details." >&5 |
| -$as_echo "$as_me: error: cannot run test program while cross compiling |
| -See \`config.log' for more details." >&2;} |
| - { (exit 1); exit 1; }; }; } |
| +: |
| else |
| cat >conftest.$ac_ext <<_ACEOF |
| /* confdefs.h. */ |
| /trunk/debian/patches/00list |
|---|
| 5,3 → 5,4 |
| 07_dynamic_module_makefile.in-libgcc |
| 10_misplaced_MAXPATHLEN |
| 11_pthread_stub |
| unbreak_cross_compilation |
| /trunk/debian/pike7.8-core.postinst |
|---|
| 31,7 → 31,6 |
| LOCAL_DIRS="lib/pike${PIKE}/modules lib/pike${PIKE}/include" |
| update_modules () { |
| $PIKEBIN -x dump $@ --distquiet -r /usr/lib/$PIKEBIN/modules |
| find /usr/lib/$PIKEBIN/modules -name '*.o' | sed 's/.o$//' | |
| while read f; do |
| if [ ! -f $f ]; then |
| 38,6 → 37,7 |
| rm -f $f.o |
| fi |
| done |
| $PIKEBIN -x dump $@ --distquiet -r /usr/lib/$PIKEBIN/modules |
| } |
| case "$1" in |
| /trunk/debian/changelog |
|---|
| 8,8 → 8,11 |
| * Drop apparently obsolete build-dep libgtkhtml2-dev. |
| * Don't run update-alternatives --remove on upgrade. |
| * Exclude Tools.PV, which requires GTK (not GTK2). |
| * debian/rules, unbreak_cross_compilation.dpatch: Use the right gcc |
| and pass --host=$(DEB_HOST_GNU_TYPE) to configure as necessary. |
| Fix various bugs preventing cross compilation. Thanks to Marc Dirix. |
| -- Magnus Holmgren <holmgren@debian.org> Sun, 06 Jun 2010 00:27:53 +0200 |
| -- Magnus Holmgren <holmgren@debian.org> Sun, 06 Jun 2010 20:00:18 +0200 |
| pike7.8 (7.8.352-dfsg-1) experimental; urgency=low |
| /trunk/debian/rules |
|---|
| 20,6 → 20,16 |
| CC=gcc |
| endif |
| export DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) |
| export DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) |
| CFARGSEXTRA = --with-cdebug |
| ifneq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE)) |
| export CC=$(DEB_HOST_GNU_TYPE)-gcc |
| CFARGSEXTRA += --host=$(DEB_HOST_GNU_TYPE) |
| endif |
| ifeq (,$(DEB_BUILD_ARCH)) |
| DEB_BUILD_ARCH=$(shell dpkg-architecture -qDEB_BUILD_ARCH) |
| endif |
| 31,8 → 41,6 |
| SSP_FLAGS=-fstack-protector |
| endif |
| CFARGSEXTRA = --with-cdebug |
| ifneq (,$(filter noopt,$(DEB_BUILD_OPTIONS))) |
| CFARGSEXTRA += --without-copt |
| else |