WebSVN - pike - Path Comparison - /trunk/debian/patches Rev 228 and /tags/8.0.388-2/debian/patches Rev 276

Ignore whitespace Rev 228 → Rev 276

/tags/8.0.388-2/debian/patches/freetype_2.6_typeof.patch
File deleted

 /tags/8.0.388-2/debian/patches/pthread_stub.patch
 ,18 → 1,11
---- a/src/configure
-+++ b/src/configure
-@@ -69299,6 +69299,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
-@@ -4062,6 +4062,9 @@ pthread_t gazonk;
+@@ -3937,6 +3937,9 @@ pthread_t gazonk;
      AC_MSG_CHECKING(for pthread_atfork)
      AC_CACHE_VAL(pike_cv_have_pthread_atfork,[
        AC_TRY_LINK([#include <pthread.h>

 /tags/8.0.388-2/debian/patches/smartlink_verbose.patch
 ,0 → 1,13
+Description: Make smartlink echo what it's doing to enable build log checking.
+--- a/bin/smartlink
++++ b/bin/smartlink
+@@ -205,7 +205,7 @@ case "$UNAME" in
+   ;;
+ esac
+-#echo $LINKER $LDOPTS
++echo $LINKER $LDOPTS
+ # exec $LINKER $LDOPTS
+ # Used to be exec, but Digital-Unix's stupid sh has buggy variable-expansion.

 /tags/8.0.388-2/debian/patches/no_dump_modules.patch
 ,7 → 3,7
 --- a/bin/install.pike
 +++ b/bin/install.pike
-@@ -2988,7 +2988,6 @@ the PRIVATE_CRT stuff in install.pike.\n
+@@ -2993,7 +2993,6 @@ the PRIVATE_CRT stuff in install.pike.\n
    {
      do_export();
    }else{

 /tags/8.0.388-2/debian/patches/series
 ,6 → 2,7
 smartlink_rpath.patch
 #make_variables_fpic.patch
 #install.pike.patch
+smartlink_verbose.patch
 no_dump_modules.patch
 dynamic_module_makefile.in-libgcc.patch
 misplaced_MAXPATHLEN.patch
 ,4 → 12,4
 hurd.patch
 undefined_htons.patch
 bad_size_t_redef.patch
-freetype_2.6_typeof.patch
+dont_disable_debug_symbols.patch

 /tags/8.0.388-2/debian/patches/unbreak_cross_compilation.patch
 ,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
-@@ -7999,7 +7999,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
 ,12 → 14,12
    RUNTPIKE="USE_PIKE"
  else
    RUNPIKE="DEFAULT_RUNPIKE"
-@@ -80177,7 +80177,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

 /tags/8.0.388-2/debian/patches/module-layout.patch
 ,7 → 3,7
 --- a/lib/master.pike.in
 +++ b/lib/master.pike.in
-@@ -2271,6 +2271,10 @@ protected void create()
+@@ -1827,6 +1827,10 @@ protected void create()
    add_module_path("#lib_prefix#/modules");
  #endif

 /tags/8.0.388-2/debian/patches/smartlink_rpath.patch
 ,31 → 14,3
     ;;
     UnixWare\ 7.*)
       if test x$LINKING != xno -a "x$RPATH" != x ; then
---- a/src/smartlink.c
-+++ b/src/smartlink.c
-@@ -162,7 +162,7 @@ int main(int argc, char **argv)
-   full_rpath = rpath;
- #ifdef USE_Wl
--  strcat(rpath, "-Wl,-rpath,");
-+  /* strcat(rpath, "-Wl,-rpath,"); */
- #elif defined(USE_Wl_R)
-   strcat(rpath, "-Wl,-R");
- #elif defined(USE_R)
-@@ -312,7 +312,7 @@ int main(int argc, char **argv)
-     }
-     rpath_in_use |= add_path(rpath, ld_lib_path);
-   }
--
-+#if 0
-   if (rpath_in_use) {
-     /* Delete the terminating ':' */
-     rpath[strlen(rpath) - 1] = 0;
-@@ -359,6 +359,7 @@ int main(int argc, char **argv)
- #error Unknown method
- #endif
-   }
-+#endif
-   new_argv[new_argc++] = NULL;

 /tags/8.0.388-2/debian/patches/hurd.patch
 ,7 → 52,7
  #endif
 --- a/src/configure.in
 +++ b/src/configure.in
-@@ -3246,7 +3246,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 \
 ,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,,,[
-@@ -7561,7 +7561,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";;
 ,38 → 70,9
      FreeBSD*) LDSHARED="$REALCC -Wl,-Bshareable";;
      NetBSD*) LDSHARED="$REALCC -Wl,-Bshareable";;
      OpenBSD*) LDSHARED="$REALCC -Wl,-Bshareable";;
---- a/src/configure
-+++ b/src/configure
-@@ -64931,7 +64931,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
-@@ -65034,7 +65034,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
-@@ -77631,7 +77631,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
-@@ -894,6 +894,9 @@
+@@ -900,6 +900,9 @@
  /* Define to 1 if you have the <mach/mach_init.h> header file. */
  #undef HAVE_MACH_MACH_INIT_H

 /tags/8.0.388-2/debian/patches/dont_disable_debug_symbols.patch
 ,0 → 1,31
+Description: Don't modify CFLAGS for unclear reasons in GL or GTK2.
+--- a/src/post_modules/GL/Makefile.in
++++ b/src/post_modules/GL/Makefile.in
+@@ -5,13 +5,6 @@ MODULE_LDFLAGS=@LDFLAGS@ @LIBS@
+ CONFIG_HEADERS=@CONFIG_HEADERS@
+ MODULE_CFLAGS=@X_CFLAGS@
+-override:
+-#      @echo "Original CFLAGS:$(CFLAGS)"
+-#      @echo "Modified CFLAGS: `echo ' $(CFLAGS) ' | sed -e 's/ -g[^ ]*//g' -e 's/ -W[^ ]*//g' -e 's/ -O[^ ]*//g'` -O `echo ' $(CFLAGS) ' | sed -ne 's/.*\( -gcc-version[^ ]*\).*/\1/p'`"
+-       @$(MAKE) \
+-         CFLAGS="`echo ' $(CFLAGS) ' | sed -e 's/ -g[^ ]*//g' -e 's/ -W[^ ]*//g' -e 's/ -O[^ ]*//g'` -O `echo ' $(CFLAGS) ' | sed -ne 's/.*\( -gcc-version[^ ]*\).*/\1/p'`" \
+-         all
+-
+ @dynamic_module_makefile@
+ auto.c : $(SRCDIR)/auto.c.in $(SRCDIR)/features.pike $(SRCDIR)/constants.pike $(SRCDIR)/gen.pike
+--- a/src/post_modules/GTK2/Makefile.in
++++ b/src/post_modules/GTK2/Makefile.in
+@@ -58,10 +58,7 @@ compile1: options
+            test -f "$$f" || ln -s "$(srcdir)/$$f" "$$f"; \
+          done; \
+        else :; fi
+-#      @echo "Original CFLAGS:$(CFLAGS)"
+-#      @echo "Modified CFLAGS:`echo ' $(CFLAGS) ' | sed -e 's/ -g[^ ]*//g' -e 's/ -W[^ ]*//g'` `echo ' $(CFLAGS) ' | sed -ne 's/.*\( -gcc-version[^ ]*\).*/\1/p'`"
+        @$(MAKE) OBJS="`cat files_to_compile`" \
+-                CFLAGS="`echo ' $(CFLAGS) ' | sed -e 's/ -g[^ ]*/ /g' -e 's/ -W[^ ]*/ /g'` `echo ' $(CFLAGS) ' | sed -ne 's/.*\( -gcc-version[^ ]*\).*/\1/p'`" \
+                 MAKE_FLAGS='-e $(MAKE_FLAGS)' \
+                 all

 /tags/8.0.388-2/debian/patches/undefined_htons.patch
 ,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
-@@ -3584,7 +3584,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 :
-@@ -3611,7 +3611,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"

Subversion Repositories pike

Compare Revisions

Ignore whitespace Rev 228 → Rev 276