...
 
Commits (2)
gauche (0.9.6-8) unstable; urgency=medium
* debian/patches/45_avoid_duplicate_LDFLAGS.patch: Remove.
* debian/patches/42_cflags_reproducible.patch: More fix.
* debian/patches/31_ldflags_for_ext.patch: Fix.
-- NIIBE Yutaka <gniibe@fsij.org> Sun, 07 Oct 2018 21:27:14 +0900
gauche (0.9.6-7) unstable; urgency=medium gauche (0.9.6-7) unstable; urgency=medium
* debian/rules: Use dh_auto_configure. * debian/rules: Use dh_auto_configure.
......
Description: Include @LDFLAGS@ for ext Description: Include @LDFLAGS@ for ext
Author: NIIBE Yutaka <gniibe@fsij.org> Author: NIIBE Yutaka <gniibe@fsij.org>
Last-Update: 2018-10-03 Last-Update: 2018-10-07
Index: gauche/ext/Makefile.ext.in Index: gauche/ext/Makefile.ext.in
=================================================================== ===================================================================
...@@ -15,3 +15,16 @@ Index: gauche/ext/Makefile.ext.in ...@@ -15,3 +15,16 @@ Index: gauche/ext/Makefile.ext.in
BUILD_GOSH_FLAGS = BUILD_GOSH_FLAGS =
# These are set by configure # These are set by configure
Index: gauche/ext/tls/Makefile.in
===================================================================
--- gauche.orig/ext/tls/Makefile.in
+++ gauche/ext/tls/Makefile.in
@@ -83,7 +83,7 @@ $(AXTLS_OBJECTS): $(EXTRA_DIRS_TARGET)
# We build the test executable (ssltest) at the build time
$(SSLTEST): $(SSLTEST_OBJECTS) $(AXTLS_OBJECTS)
- $(CCLD) $(LOCAL_LFLAGS) $(XLDFLAGS) -o $(SSLTEST) $(SSLTEST_OBJECTS) $(AXTLS_OBJECTS) $(LIBS) -lpthread
+ $(CCLD) @LDFLAGS@ $(LOCAL_LFLAGS) $(XLDFLAGS) -o $(SSLTEST) $(SSLTEST_OBJECTS) $(AXTLS_OBJECTS) $(LIBS) -lpthread
# The 'system' macro hack is to suppress "ignoring result" warning
$(SSLTEST_GENERATED) : axTLS/ssl/test/ssltest.c ssltest-mod.scm axtls_dirs
Description: Reproducible build: filter CFLAGS's -fdebug-prefix-map Description: Reproducible build: filter CFLAGS's -f.*-prefix-map
Author: NIIBE Yutaka <gniibe@fsij.org> Author: NIIBE Yutaka <gniibe@fsij.org>
Last-Update: 2018-10-06 Last-Update: 2018-10-07
Index: gauche/configure.ac Index: gauche/configure.ac
=================================================================== ===================================================================
...@@ -11,7 +11,7 @@ Index: gauche/configure.ac ...@@ -11,7 +11,7 @@ Index: gauche/configure.ac
dnl put the args to the configure in gauche-config script for later use. dnl put the args to the configure in gauche-config script for later use.
dnl the use of ac_configure_args depends on autoconf 2.52. dnl the use of ac_configure_args depends on autoconf 2.52.
-GAUCHE_CONFIGURE_ARGS=`echo "$ac_configure_args" | sed 's/@<:@\\"\`\$@:>@/\\\\&/g'` -GAUCHE_CONFIGURE_ARGS=`echo "$ac_configure_args" | sed 's/@<:@\\"\`\$@:>@/\\\\&/g'`
+GAUCHE_CONFIGURE_ARGS=`echo "$ac_configure_args" | sed 's/@<:@\\"\`\$@:>@/\\\\&/g' 's/-fdebug-prefix-map=@<:@^ @:>@* //'` +GAUCHE_CONFIGURE_ARGS=`echo "$ac_configure_args" | sed 's/@<:@\\"\`\$@:>@/\\\\&/g' 's/-f@<:@a-z@:>@*-prefix-map=@<:@^ @:>@* //'`
AC_SUBST(GAUCHE_CONFIGURE_ARGS) AC_SUBST(GAUCHE_CONFIGURE_ARGS)
dnl ========================================================== dnl ==========================================================
...@@ -20,7 +20,7 @@ Index: gauche/configure.ac ...@@ -20,7 +20,7 @@ Index: gauche/configure.ac
dnl If the user overrides CFLAGS during configure, which is recorded. dnl If the user overrides CFLAGS during configure, which is recorded.
dnl This information is used when configuring extensions. dnl This information is used when configuring extensions.
-DEFAULT_CFLAGS="$CFLAGS" -DEFAULT_CFLAGS="$CFLAGS"
+DEFAULT_CFLAGS="$(echo "$CFLAGS" | sed 's/-fdebug-prefix-map=@<:@^ @:>@* //')" +DEFAULT_CFLAGS="$(echo "$CFLAGS" | sed 's/-f@<:@a-z@:>@*-prefix-map=@<:@^ @:>@* //')"
AC_SUBST(DEFAULT_CFLAGS) AC_SUBST(DEFAULT_CFLAGS)
dnl =========================================================== dnl ===========================================================
Index: gauche/tools/gc-configure.gnu-gauche.in
===================================================================
--- gauche.orig/tools/gc-configure.gnu-gauche.in
+++ gauche/tools/gc-configure.gnu-gauche.in
@@ -27,5 +27,4 @@ ${SHELL} "@srcdir@/configure" "${@}" \
--enable-threads="@GAUCHE_THREAD_TYPE@" \
--enable-large-config \
--disable-gcj-support \
- CPPFLAGS="${CPPFLAGS} -DDONT_ADD_BYTE_AT_END @LOCAL_INC@" \
- LDFLAGS="${LDFLAGS} @LOCAL_LIB@"
+ CPPFLAGS="${CPPFLAGS} -DDONT_ADD_BYTE_AT_END @LOCAL_INC@"