Subversion Repositories pike

Compare Revisions

Ignore whitespace Rev 274 → Rev 275

/trunk/debian/changelog
1,3 → 1,14
pike8.0 (8.0.388-2) unstable; urgency=low
 
* Run src/run_autoconfig before compiling and run configure in a
separate target; don't patch configure scripts, only their
configure.in sources. Also refresh patches and augment some
descriptions. This also avoids problems with configure complaining
about being last changed in the future when it was in fact last
changed right now.
 
-- Magnus Holmgren <holmgren@debian.org> Sun, 15 Jan 2017 22:26:12 +0100
 
pike8.0 (8.0.388-1) unstable; urgency=low
 
* New upstream stable release.
/trunk/debian/rules
143,16 → 143,22
#export CFLAGS CC PIKE VERSION
export CC
 
configure: configure-stamp
configure-stamp:
dh_autoreconf src/run_autoconfig
$(MAKE) force_configure CONFIGUREARGS="$(CFARGS)"
touch configure-stamp
 
build-arch: build-arch-stamp
build-arch-stamp:
build-arch-stamp: configure
dh_testdir
$(MAKE) compile CONFIGUREARGS="$(CFARGS)"
$(MAKE) compile
touch build-arch-stamp
 
build-indep: build-indep-stamp
build-indep-stamp:
build-indep-stamp: configure
dh_testdir
$(MAKE) documentation CONFIGUREARGS="$(CFARGS)"
$(MAKE) documentation
touch build-indep-stamp
 
build: build-arch build-indep
162,6 → 168,7
dh_testroot
$(MAKE) distclean
rm -rf refdoc/modref refdoc/traditional_manual
dh_autoreconf_clean
dh_clean
 
install: build-arch
/trunk/debian/control
4,7 → 4,8
Maintainer: Magnus Holmgren <holmgren@debian.org>
Uploaders: Henrik Andreasson <debian@han.pp.se>
Standards-Version: 3.9.8
Build-Depends: dpkg-dev (>= 1.15.7), debhelper (>= 9), bison, sharutils, bc, pkg-config,
Build-Depends: dpkg-dev (>= 1.15.7), debhelper (>= 9), bison,
sharutils, bc, pkg-config, dh-autoreconf,
libgmp10-dev, nettle-dev (>= 2.1~), zlib1g-dev | libz-dev,
libbz2-dev, libgdbm-dev, unixodbc-dev, default-libmysqlclient-dev,
libpq-dev, libsqlite3-dev, libpcre3-dev, libsdl-mixer1.2-dev,
/trunk/debian/patches/pthread_stub.patch
1,15 → 1,8
--- a/src/configure
+++ b/src/configure
@@ -69337,6 +69337,9 @@ else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <pthread.h>
+#if defined(__stub_pthread_atfork) || defined(__stub___pthread_atfork)
+#error pthread_atfork is just a stub
+#endif
void foo(void) { pthread_atfork(0,0,0); }
int
Description: Detect if pthread_atfork(), although defined, is just a stub
May be the case on GNU/Hurd.
Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
Bug-Debian: https://bugs.debian.org/462998
 
--- a/src/configure.in
+++ b/src/configure.in
@@ -3937,6 +3937,9 @@ pthread_t gazonk;
/trunk/debian/patches/unbreak_cross_compilation.patch
1,14 → 1,11
#! /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
Author: Marc Dirix <marc@electronics-design.nl>
Description: Fix various breakage preventing cross compilation:
* Use the installed pike when needed, not the newly built one.
* Don't disable dynamic module loading just because we're cross-compiling
 
@DPATCH@
--- a/src/configure
+++ b/src/configure
@@ -7936,7 +7936,7 @@ if test "x$enable_binary" = "xno"; then
--- a/src/configure.in
+++ b/src/configure.in
@@ -472,7 +472,7 @@ if test "x$enable_binary" = "xno"; then
RUNPIKE="USE_PIKE"
RUNTPIKE="USE_PIKE"
elif test "x$cross_compiling" = "xyes"; then
17,12 → 14,12
RUNTPIKE="USE_PIKE"
else
RUNPIKE="DEFAULT_RUNPIKE"
@@ -79105,7 +79105,7 @@ EOF
;;
esac
if test "$cross_compiling" = yes; then :
- pike_cv_sys_dynamic_loading=no
+ pike_cv_sys_dynamic_loading=yes
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@@ -7803,7 +7803,7 @@ EOF
__attribute__ ((visibility("default")))
# endif
void testfunc2(void) { exit(0); }
-], pike_cv_sys_dynamic_loading=yes, pike_cv_sys_dynamic_loading=no, pike_cv_sys_dynamic_loading=no)
+], pike_cv_sys_dynamic_loading=yes, pike_cv_sys_dynamic_loading=no, pike_cv_sys_dynamic_loading=yes)
CFLAGS="$OLD_CFLAGS"
CC="$OLD_CC"
else
/trunk/debian/patches/hurd.patch
52,7 → 52,7
#endif
--- a/src/configure.in
+++ b/src/configure.in
@@ -3226,7 +3226,7 @@ AC_CHECK_HEADERS(winsock2.h sys/rusage.h
@@ -3233,7 +3233,7 @@ AC_CHECK_HEADERS(winsock2.h sys/rusage.h
float.h sys/priocntl.h sys/sched.h winbase.h errno.h \
stddef.h sys/termio.h sys/termios.h \
ws2tcpip.h valgrind/memcheck.h memcheck.h valgrind.h \
61,7 → 61,7
mach/mach_init.h syscall.h sys/syscall.h devices/timer.h \
direct.h CoreServices/CoreServices.h execinfo.h \
mach/mach.h mach/thread_act.h mach/clock.h urcu.h,,,[
@@ -7550,7 +7550,7 @@ if test -z "$LDSHARED" ; then
@@ -7557,7 +7557,7 @@ if test -z "$LDSHARED" ; then
next*) LDSHARED="$REALCC $CFLAGS -nostdlib -r";;
Linux*) LDSHARED="$REALCC -shared";;
GNU/kFreeBSD*) LDSHARED="$REALCC -shared";;
70,38 → 70,9
FreeBSD*) LDSHARED="$REALCC -Wl,-Bshareable";;
NetBSD*) LDSHARED="$REALCC -Wl,-Bshareable";;
OpenBSD*) LDSHARED="$REALCC -Wl,-Bshareable";;
--- a/src/configure
+++ b/src/configure
@@ -65173,7 +65173,7 @@ fi
float.h sys/priocntl.h sys/sched.h winbase.h errno.h \
stddef.h sys/termio.h sys/termios.h \
ws2tcpip.h valgrind/memcheck.h memcheck.h valgrind.h \
- sys/prctl.h sys/ioctl.h mach/task_info.h mach/task.h \
+ sys/prctl.h sys/ioctl.h mach/message.h mach/task_info.h mach/task.h \
mach/mach_init.h syscall.h sys/syscall.h devices/timer.h \
direct.h CoreServices/CoreServices.h execinfo.h \
mach/mach.h mach/thread_act.h mach/clock.h urcu.h
@@ -65276,7 +65276,7 @@ done
float.h sys/priocntl.h sys/sched.h winbase.h errno.h \
stddef.h sys/termio.h sys/termios.h \
ws2tcpip.h valgrind/memcheck.h memcheck.h valgrind.h \
- sys/prctl.h sys/ioctl.h mach/task_info.h mach/task.h \
+ sys/prctl.h sys/ioctl.h mach/message.h mach/task_info.h mach/task.h \
mach/mach_init.h syscall.h sys/syscall.h devices/timer.h \
direct.h CoreServices/CoreServices.h execinfo.h \
mach/mach.h mach/thread_act.h mach/clock.h urcu.h
@@ -77944,7 +77944,7 @@ if test -z "$LDSHARED" ; then
next*) LDSHARED="$REALCC $CFLAGS -nostdlib -r";;
Linux*) LDSHARED="$REALCC -shared";;
GNU/kFreeBSD*) LDSHARED="$REALCC -shared";;
- GNU*) LDSHARED="$REALCC -Wl,-Bshareable";;
+ GNU*) LDSHARED="$REALCC -shared";;
FreeBSD*) LDSHARED="$REALCC -Wl,-Bshareable";;
NetBSD*) LDSHARED="$REALCC -Wl,-Bshareable";;
OpenBSD*) LDSHARED="$REALCC -Wl,-Bshareable";;
--- a/src/machine.h.in
+++ b/src/machine.h.in
@@ -897,6 +897,9 @@
@@ -900,6 +900,9 @@
/* Define to 1 if you have the <mach/mach_init.h> header file. */
#undef HAVE_MACH_MACH_INIT_H
/trunk/debian/patches/undefined_htons.patch
48,23 → 48,3
/* Define to 1 if you have the <stdint.h> header file. */
#undef HAVE_STDINT_H
--- a/src/modules/_Protocols_DNS_SD/configure
+++ b/src/modules/_Protocols_DNS_SD/configure
@@ -3691,7 +3691,7 @@ done
fi
-for ac_header in dns_sd.h howl.h
+for ac_header in dns_sd.h howl.h netinet/in.h arpa/inet.h
do :
@@ -3718,7 +3718,7 @@ fi
done
else
- for ac_hdr in dns_sd.h howl.h
+ for ac_hdr in dns_sd.h howl.h netinet/in.h arpa/inet.h
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
eval "ac_cv_header_$ac_safe=yes"
/trunk/debian/autoreconf
0,0 → 1,0
src