Commit 17ce1d72 authored by Aaron M. Ucko's avatar Aaron M. Ucko

Rework fltk-config handling as in #828081.

* debian/rules: Drop the fltk-config.unhardened business, which proved
  insufficient.  (Do, however, postprocess fltk-config to avoid emitting
  the -fdebug-prefix-map=... flag intended to *improve* reproducibility!)
* fltk-config.in: Filter out -D*, -f*, and -W*, not just -g* and -O* (but
  leave --optim output alone for reference).
parent e826c9c3
......@@ -8,10 +8,15 @@ fltk1.1 (1.1.10-23) UNRELEASED; urgency=medium
packages.
* debian/libfltk1.1.symbols: GCC's stopped emitting one more destructor
variant.
* debian/rules: Stop collecting debug symbols in an explicit libfltk1.1-dbg
package.
-- Aaron M. Ucko <ucko@debian.org> Tue, 24 Jan 2017 23:09:31 -0500
* debian/rules:
- Stop collecting debug symbols in an explicit libfltk1.1-dbg package.
- Drop the fltk-config.unhardened business, which proved insufficient.
(Do, however, postprocess fltk-config to avoid emitting the
-fdebug-prefix-map=... flag intended to *improve* reproducibility!)
* fltk-config.in: Filter out -D*, -f*, and -W*, not just -g* and -O* (but
leave --optim output alone for reference). (See #828081.)
-- Aaron M. Ucko <ucko@debian.org> Tue, 24 Jan 2017 23:15:25 -0500
fltk1.1 (1.1.10-22) unstable; urgency=medium
......
......@@ -19,12 +19,6 @@ libdir = /usr/lib/$(DEB_HOST_MULTIARCH)
override_dh_auto_configure:
mv fltk.spec fltk.spec.saved
dh_auto_configure -- CC="$(CC)" CXX="$(CXX)" \
--enable-shared --enable-threads --enable-xft \
--enable-xinerama --libdir=$(libdir) \
$(shell DEB_BUILD_MAINT_OPTIONS=hardening=-all \
dpkg-buildflags --export=configure)
mv fltk-config fltk-config.unhardened
dh_auto_configure -- CC="$(CC)" CXX="$(CXX)" \
DSOFLAGS="$(filter-out -fPIE -pie,$(LDFLAGS))" \
--enable-shared --enable-threads --enable-xft \
......@@ -43,8 +37,7 @@ override_dh_auto_clean:
mv fltk.spec.saved fltk.spec
override_dh_clean:
dh_clean debian/libfltk1.1.symbols.$(DEB_HOST_ARCH) \
fltk-config.unhardened
dh_clean debian/libfltk1.1.symbols.$(DEB_HOST_ARCH)
override_dh_auto_install-arch:
dh_auto_install
......@@ -73,7 +66,13 @@ override_dh_auto_install-arch:
cp CMake/FLTKUse.cmake debian/CMakeCache.txt debian/tmp/usr/lib/fltk
sed 's,@libdir@,$(libdir),' debian/FLTKConfig.cmake.in \
>debian/tmp/usr/lib/fltk/FLTKConfig.cmake
install fltk-config.unhardened debian/tmp/usr/bin/fltk-config
override_dh_install-arch:
## libfltk1.1-dev
sed -e 's/ -fdebug-prefix-map=[^ ]*=\. / /' fltk-config \
> debian/tmp/usr/bin/fltk-config
chmod +x debian/tmp/usr/bin/fltk-config
dh_install
override_dh_installdocs:
dh_installdocs -A CREDITS README
......
......@@ -287,11 +287,11 @@ if test -n "$post" -a "$POSTBUILD" != ":"; then
fi
if test "$echo_cflags" = "yes"; then
echo "$includes $CFLAGS" | sed -e 's/ -[gO][^ ]*//g'
echo "$includes $CFLAGS" | sed -e 's/ -[DfgOW][^ ]*//g'
fi
if test "$echo_cxxflags" = "yes"; then
echo "$includes $CXXFLAGS" | sed -e 's/ -[gO][^ ]*//g'
echo "$includes $CXXFLAGS" | sed -e 's/ -[DfgOW][^ ]*//g'
fi
if test "$echo_optim" = "yes"; then
......@@ -311,11 +311,11 @@ if test "$echo_ldflags" = "yes"; then
fi
fi
done
echo $libdirs $my_libs
echo " $libdirs $my_libs" | sed -e 's/ -W[^ ]*//g' -e 's/^ *//'
fi
if test "$echo_ldstaticflags" = "yes"; then
echo $LDSTATIC
echo " $LDSTATIC " | sed -e 's/ -W[^ ]*//g' -e 's/^ *//'
fi
if test "$echo_libs" = "yes"; then
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment