[csw-devel] SF.net SVN: gar:[9866] csw/mgar/pkg/cpan/GD/trunk/Makefile

[dmichelsen at users.sourceforge.net]

Revision: 9866
          http://gar.svn.sourceforge.net/gar/?rev=9866&view=rev
Author:   dmichelsen
Date:     2010-05-14 14:31:44 +0000 (Fri, 14 May 2010)

Log Message:
-----------
cpan/GD: Rebuild to force linkage to OpenCSW X11

Modified Paths:
--------------
    csw/mgar/pkg/cpan/GD/trunk/Makefile

Modified: csw/mgar/pkg/cpan/GD/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/GD/trunk/Makefile	2010-05-14 13:18:55 UTC (rev 9865)
+++ csw/mgar/pkg/cpan/GD/trunk/Makefile	2010-05-14 14:31:44 UTC (rev 9866)
@@ -21,12 +21,9 @@
 LICENSE = LICENSE
 
 DEP_PKGS = CSWftype2 CSWgd CSWiconv CSWjpeg CSWpng
-DEP_PKGS += CSWzlib CSWfconfig
+DEP_PKGS += CSWzlib CSWlibxpm CSWlibx11 CSWfconfig
 
-# Make sure we bind against Openwin libXpm
-NOISALIST = 1
-EXTRA_LIB = /usr/openwin/lib
-
+# These don't actually do anything as the pathes are already confgured
 CONFIGURE_ARGS  = lib_gd_path $(libdir)
 CONFIGURE_ARGS += lib_ft_path $(libdir)
 CONFIGURE_ARGS += lib_png_path $(libdir)
@@ -34,9 +31,13 @@
 CONFIGURE_ARGS += lib_xpm_path /usr/openwin/lib
 CONFIGURE_ARGS += lib_zlib_path $(libdir)
 
+NOISALIST = 1
+EXTRA_LIB = $(prefix)/X11/lib
+
+BUILD_OVERRIDE_VARS = CCFLAGS LD
 # Don't use hardcoded -Wformat=0
-BUILD_OVERRIDE_DIRS = CCFLAGS
+BUILD_OVERRIDE_VAR_CCFLAGS =
+# Force hardcode binding to OpenCSW X11
+BUILD_OVERRIDE_VAR_LD = $(CC) -L$(prefix)/X11/lib
 
-CHECKPKG_OVERRIDES_CSWpmgd += linked-against-discouraged-library|GD.so|libX11.so.4
-
 include gar/category.mk


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