r72451 - in /trunk/libauthen-krb5-perl/debian: changelog patches/better-compiler-flags
gregoa at users.alioth.debian.org
gregoa at users.alioth.debian.org
Sun Apr 10 13:04:24 UTC 2011
Author: gregoa
Date: Sun Apr 10 13:03:41 2011
New Revision: 72451
URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=72451
Log:
New version of patch better-compilter-flags: use krb5-config to query the
necessary library options; thanks to Steve Langasek for forwarding the
patch from Ubuntu (closes: #622090).
Modified:
trunk/libauthen-krb5-perl/debian/changelog
trunk/libauthen-krb5-perl/debian/patches/better-compiler-flags
Modified: trunk/libauthen-krb5-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libauthen-krb5-perl/debian/changelog?rev=72451&op=diff
==============================================================================
--- trunk/libauthen-krb5-perl/debian/changelog (original)
+++ trunk/libauthen-krb5-perl/debian/changelog Sun Apr 10 13:03:41 2011
@@ -1,7 +1,13 @@
libauthen-krb5-perl (1.9-3) UNRELEASED; urgency=low
+ [ Ansgar Burchardt ]
* debian/control: Update Homepage field.
* Update my email address.
+
+ [ gregor herrmann ]
+ * New version of patch better-compilter-flags: use krb5-config to query the
+ necessary library options; thanks to Steve Langasek for forwarding the
+ patch from Ubuntu (closes: #622090).
-- Ansgar Burchardt <ansgar at 43-1.org> Tue, 26 Jan 2010 18:58:14 +0900
Modified: trunk/libauthen-krb5-perl/debian/patches/better-compiler-flags
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libauthen-krb5-perl/debian/patches/better-compiler-flags?rev=72451&op=diff
==============================================================================
--- trunk/libauthen-krb5-perl/debian/patches/better-compiler-flags (original)
+++ trunk/libauthen-krb5-perl/debian/patches/better-compiler-flags Sun Apr 10 13:03:41 2011
@@ -1,37 +1,35 @@
-Description: don't link with -lresolv
- Don't link with -lresolv to avoid unnecessary shared library
- dependencies. Strip unnecessary -I/usr/include and -L/usr/lib
- flags which may cause problems.
-Author: Russ Allbery <rra at debian.org>
-Reviewed-By: Jonathan Yu <jawnsy at cpan.org>
+Description: use krb5-config to query the necessary library options
Origin: vendor
-Forwarded: not-needed
+Bug-Debian: http://bugs.debian.org/622090
+Forwarded: no
+Author: Steve Langasek <steve.langasek at canonical.com>
+Reviewed-by: gregor herrmann <gregoa at debian.org>
+Last-Update: 2011-04-10
+
--- a/Makefile.PL
+++ b/Makefile.PL
-@@ -8,7 +8,8 @@
- # any extra libraries?
- # add -lresolv here if you get errors like the following (usually on linux):
- # undefined symbol: __res_search
--my $KRB5_EXTRALIBS = '-lresolv';
-+# Only needed with static linking, so not needed on Debian.
-+#my $KRB5_EXTRALIBS = '-lresolv';
+@@ -18,22 +18,10 @@
- # location of Kerberos 5 includes
- my $KRB5_INCDIR = '/usr/include';
-@@ -30,10 +31,14 @@
- $cryptolib = '-lcrypto';
- }
+ ##### DO NOT CHANGE ANYTHING BELOW HERE #####
-+# Don't add -L/usr/lib or -I/usr/include; they can cause problems.
-+my $ldflags = ($KRB5_LIBDIR eq '/usr/lib') ? '' : "-L${KRB5_LIBDIR}";
-+my $cppflags = ($KRB5_INCDIR eq '/usr/include') ? '' : "-I${KRB5_INCDIR}";
-+
+-# check for libk5crypto -- only in krb5-1.1 and above
+-print "Checking for libk5crypto...";
+-my $cryptolib;
+-if ( -r "${KRB5_LIBDIR}/libk5crypto.a" || -r "${KRB5_LIBDIR}/libk5crypto.so" ) {
+- print "yes\n";
+- $cryptolib = '-lk5crypto';
+-}
+-else {
+- print "no. I'll use libcrypto instead.\n";
+- $cryptolib = '-lcrypto';
+-}
+-
WriteMakefile(
'NAME' => 'Authen::Krb5',
'VERSION_FROM' => 'Krb5.pm',
- 'LIBS' => ["-L${KRB5_LIBDIR} -lkrb5 ${cryptolib} -lcom_err $KRB5_EXTRALIBS"],
-+ 'LIBS' => ["$ldflags -lkrb5 ${cryptolib} -lcom_err $KRB5_EXTRALIBS"],
++ 'LIBS' => [`krb5-config --libs`],
'DEFINE' => '',
- 'INC' => "-I${KRB5_INCDIR} $KRB5_EXTRAINCS"
-+ 'INC' => "$cppflags $KRB5_EXTRAINCS"
++ 'INC' => `krb5-config --cflags`
);
More information about the Pkg-perl-cvs-commits
mailing list