[csw-devel] SF.net SVN: gar:[8287] csw/mgar/gar/v2

[dmichelsen at users.sourceforge.net]

Revision: 8287
          http://gar.svn.sourceforge.net/gar/?rev=8287&view=rev
Author:   dmichelsen
Date:     2010-02-01 09:54:24 +0000 (Mon, 01 Feb 2010)

Log Message:
-----------
mGAR v2: Move -lperl in category cpan to LD_OPTIONS

Modified Paths:
--------------
    csw/mgar/gar/v2/categories/cpan/category.mk
    csw/mgar/gar/v2/gar.conf.mk

Modified: csw/mgar/gar/v2/categories/cpan/category.mk
===================================================================
--- csw/mgar/gar/v2/categories/cpan/category.mk	2010-02-01 00:13:32 UTC (rev 8286)
+++ csw/mgar/gar/v2/categories/cpan/category.mk	2010-02-01 09:54:24 UTC (rev 8287)
@@ -62,8 +62,8 @@
 INSTALL_ENV   += PERL5LIB=$(PERL5LIB)
 
 # Configure a target using Makefile.PL
-BIND_LIBPERL ?= LIBS=-lperl
-PERL_CONFIGURE_ARGS ?= INSTALLDIRS=vendor $(BIND_LIBPERL) $(EXTRA_PERL_CONFIGURE_ARGS)
+_CATEGORY_LD_OPTIONS ?= -L$(libdir) -lperl
+PERL_CONFIGURE_ARGS ?= INSTALLDIRS=vendor $(EXTRA_PERL_CONFIGURE_ARGS)
 configure-%/Makefile.PL:
 	@echo " ==> Running Makefile.PL in $*"
 	( cd $* ; \

Modified: csw/mgar/gar/v2/gar.conf.mk
===================================================================
--- csw/mgar/gar/v2/gar.conf.mk	2010-02-01 00:13:32 UTC (rev 8286)
+++ csw/mgar/gar/v2/gar.conf.mk	2010-02-01 09:54:24 UTC (rev 8287)
@@ -525,7 +525,7 @@
 SOS11_LD_OPTIONS = $(EXTRA_SOS11_LD_OPTIONS) $(EXTRA_SOS_LD_OPTIONS)
 SOS12_LD_OPTIONS = $(EXTRA_SOS12_LD_OPTIONS) $(EXTRA_SOS_LD_OPTIONS)
 
-LD_OPTIONS ?= $(strip $($(GARCOMPILER)_LD_OPTIONS) $(RUNPATH_LINKER_FLAGS) $(EXTRA_LD_OPTIONS))
+LD_OPTIONS ?= $(strip $($(GARCOMPILER)_LD_OPTIONS) $(RUNPATH_LINKER_FLAGS) $(EXTRA_LD_OPTIONS) $(_CATEGORY_LD_OPTIONS))
 
 # 1. Make sure everything works fine for SOS12
 # 2. Allow us to use programs we just built. This is a bit complicated,


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