[csw-devel] SF.net SVN: gar:[15410] csw/mgar/pkg/krb5-lib/trunk/Makefile

[dmichelsen at users.sourceforge.net]

Revision: 15410
          http://gar.svn.sourceforge.net/gar/?rev=15410&view=rev
Author:   dmichelsen
Date:     2011-08-23 13:25:55 +0000 (Tue, 23 Aug 2011)
Log Message:
-----------
krb5-lib: Fix flags

Modified Paths:
--------------
    csw/mgar/pkg/krb5-lib/trunk/Makefile

Modified: csw/mgar/pkg/krb5-lib/trunk/Makefile
===================================================================
--- csw/mgar/pkg/krb5-lib/trunk/Makefile	2011-08-23 09:05:12 UTC (rev 15409)
+++ csw/mgar/pkg/krb5-lib/trunk/Makefile	2011-08-23 13:25:55 UTC (rev 15410)
@@ -119,6 +119,13 @@
 
 LICENSE = doc/copyright.texinfo
 
+# Wrong quoting, either fix $ISALIST or disable for now
+#NOISALIST = 1
+#LD_OPTIONS =
+#EXTRA_LINKER_FLAGS = $(RUNPATH_LINKER_FLAGS)
+
+EXTRA_CPPFLAGS += -D__EXTENSIONS__
+
 CONFIGURE_SCRIPTS = $(WORKSRC)/src/configure
 
 BUILD64 = 1
@@ -140,7 +147,6 @@
 BUILD_SCRIPTS  = $(WORKSRC)/src/Makefile
 
 TEST_SCRIPTS = $(WORKSRC)/src/Makefile
-TEST_TARGET = check
 
 SKIPTEST ?= 1
 
@@ -155,16 +161,10 @@
 
 include gar/category.mk
 
-# The flags must not contain additional spaces or the build freaks out
-CFLAGS := $(strip $(CFLAGS) -L$(libdir) -D__EXTENSIONS__)
-CXXFLAGS := $(strip $(CXXFLAGS) -D__EXTENSIONS__)
-#LDFLAGS := $(strip $(LDFLAGS))
-
-LD_OPTIONS =
-EXTRA_LINKER_FLAGS = $(RUNPATH_LINKER_FLAGS)
-
-
 post-extract-modulated:
 	@# TODO: Check signature
-	@cd $(WORKDIR) && (gzip -c -d $(NAME)-$(VERSION).tar.gz | tar xf -)
+	cd $(WORKDIR) && (gzip -c -d $(NAME)-$(VERSION).tar.gz | tar xf -)
+	@# libcrypto.so is part of openssl and expected to be linkable without setting a linker search path
+	perl -pi -e 's,-lcrypto,-L$(libdir) -lcrypto,' \
+		$(WORKSRC)/src/plugins/preauth/pkinit/Makefile.in
 	@$(MAKECOOKIE)

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.