Commit af4eb8ba authored by Iain Lane's avatar Iain Lane

Use dh_autoreconf to update libtool.m4 for new ports

parent 80925fbc
gucharmap (1:3.13.90-2) UNRELEASED; urgency=medium
* Use dh_autoreconf to update libtool.m4 for new ports, and build with
--as-needed to obsolete debian/patches/99_ltmain_as-needed.patch. Thanks
to Colin Watson in Ubuntu.
-- Iain Lane <laney@debian.org> Fri, 19 Sep 2014 11:29:24 +0100
gucharmap (1:3.13.90-1) experimental; urgency=medium
* New upstream development release.
......
......@@ -2,13 +2,13 @@
#
# Modifications should be made to debian/control.in instead.
# This file is regenerated automatically in the clean target.
Source: gucharmap
Section: gnome
Priority: optional
Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>
Uploaders: Andreas Henriksson <andreas@fatal.se>, Emilio Pozuelo Monfort <pochu@debian.org>, Michael Biebl <biebl@debian.org>
Build-Depends: cdbs,
dh-autoreconf,
debhelper (>= 8),
appdata-tools,
autotools-dev,
......
......@@ -4,6 +4,7 @@ Priority: optional
Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>
Uploaders: @GNOME_TEAM@
Build-Depends: cdbs,
dh-autoreconf,
debhelper (>= 8),
appdata-tools,
autotools-dev,
......
Link with --as-needed, -z,defs and -O1
--- a/ltmain.sh
+++ b/ltmain.sh
@@ -5799,6 +5799,11 @@
func_stripname ' ' '' "$arg"
arg=$func_stripname_result
;;
+
+ -Wl,--as-needed)
+ deplibs="$deplibs $arg"
+ continue
+ ;;
-Wl,*)
func_stripname '-Wl,' '' "$arg"
@@ -6160,6 +6165,15 @@
lib=
found=no
case $deplib in
+ -Wl,--as-needed)
+ if test "$linkmode,$pass" = "prog,link"; then
+ compile_deplibs="$deplib $compile_deplibs"
+ finalize_deplibs="$deplib $finalize_deplibs"
+ else
+ deplibs="$deplib $deplibs"
+ fi
+ continue
+ ;;
-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \
|-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*)
if test "$linkmode,$pass" = "prog,link"; then
unicode-source-generation.patch
99_ltmain_as-needed.patch
......@@ -2,12 +2,15 @@
# -*- mode: makefile; coding: utf-8 -*-
# Copyright © 2003 Colin Walters <walters@verbum.org>
include /usr/share/cdbs/1/rules/autoreconf.mk
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/rules/utils.mk
include /usr/share/cdbs/1/class/gnome.mk
include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
-include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
DEB_DH_AUTORECONF_ARGS = --as-needed
DEB_CONFIGURE_EXTRA_FLAGS += --enable-gtk-doc \
--enable-vala \
--enable-introspection
......
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