Author: fabian-guest Date: 2012-10-04 12:43:42 +0000 (Thu, 04 Oct 2012) New Revision: 13796
Added: packages/trunk/funguloids/debian/patches/libs_lua5.1.patch Modified: packages/trunk/funguloids/debian/compat packages/trunk/funguloids/debian/control packages/trunk/funguloids/debian/patches/series packages/trunk/funguloids/debian/rules Log: Fix linking order against liblua5.1, bump debhelper compat to 9 to build with hardening flags and avoid unnecessary package dependencies. Modified: packages/trunk/funguloids/debian/compat =================================================================== --- packages/trunk/funguloids/debian/compat 2012-10-04 12:23:49 UTC (rev 13795) +++ packages/trunk/funguloids/debian/compat 2012-10-04 12:43:42 UTC (rev 13796) @@ -1 +1 @@ -7 +9 Modified: packages/trunk/funguloids/debian/control =================================================================== --- packages/trunk/funguloids/debian/control 2012-10-04 12:23:49 UTC (rev 13795) +++ packages/trunk/funguloids/debian/control 2012-10-04 12:43:42 UTC (rev 13796) @@ -3,7 +3,7 @@ Section: games Maintainer: Debian Games Team <[email protected]> Uploaders: Paul Wise <[email protected]> -Build-Depends: debhelper (>= 7.0.50~), +Build-Depends: debhelper (>= 9), dh-autoreconf, pkg-config, liblua5.1-0-dev, Added: packages/trunk/funguloids/debian/patches/libs_lua5.1.patch =================================================================== --- packages/trunk/funguloids/debian/patches/libs_lua5.1.patch (rev 0) +++ packages/trunk/funguloids/debian/patches/libs_lua5.1.patch 2012-10-04 12:43:42 UTC (rev 13796) @@ -0,0 +1,14 @@ +Author: Fabian Greffrath <[email protected]> +Subject: Link against liblua5.1 in LIBS, not LDFLAGS. + +--- a/configure.ac ++++ b/configure.ac +@@ -68,7 +68,7 @@ if test "x$FUNGU_FOUND_HEADER" = "xno"; + else + CFLAGS="$CFLAGS $FUNGU_FOUND_HEADER" + CPPFLAGS="$CPPFLAGS $FUNGU_FOUND_HEADER" +- LDFLAGS="$LDFLAGS -llua5.1" ++ LIBS="$LIBS -llua5.1" + fi + AC_LANG_POP + Modified: packages/trunk/funguloids/debian/patches/series =================================================================== --- packages/trunk/funguloids/debian/patches/series 2012-10-04 12:23:49 UTC (rev 13795) +++ packages/trunk/funguloids/debian/patches/series 2012-10-04 12:43:42 UTC (rev 13796) @@ -8,3 +8,4 @@ optional_cg.patch g++4.7.patch doc_path.patch +libs_lua5.1.patch Modified: packages/trunk/funguloids/debian/rules =================================================================== --- packages/trunk/funguloids/debian/rules 2012-10-04 12:23:49 UTC (rev 13795) +++ packages/trunk/funguloids/debian/rules 2012-10-04 12:43:42 UTC (rev 13796) @@ -1,6 +1,8 @@ #! /usr/bin/make -f #export DH_VERBOSE=1 +LDFLAGS += -Wl,-z,defs -Wl,-O1 -Wl,--as-needed + ifneq (,$(findstring nomousecapture,$(DEB_BUILD_OPTIONS))) CXXFLAGS += -DDISABLE_MOUSE_CAPTURE endif _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
