[csw-devel] SF.net SVN: gar:[16611] csw/mgar/pkg/haproxy/trunk/Makefile

[dmichelsen at users.sourceforge.net]

Revision: 16611
          http://gar.svn.sourceforge.net/gar/?rev=16611&view=rev
Author:   dmichelsen
Date:     2011-12-28 22:36:46 +0000 (Wed, 28 Dec 2011)
Log Message:
-----------
haproxy/trunk: Some more updated for 64 bit

Modified Paths:
--------------
    csw/mgar/pkg/haproxy/trunk/Makefile

Modified: csw/mgar/pkg/haproxy/trunk/Makefile
===================================================================
--- csw/mgar/pkg/haproxy/trunk/Makefile	2011-12-28 22:13:00 UTC (rev 16610)
+++ csw/mgar/pkg/haproxy/trunk/Makefile	2011-12-28 22:36:46 UTC (rev 16611)
@@ -28,6 +28,17 @@
 
 LICENSE = LICENSE
 
+# Don't care for now, investigate later!
+CHECKPKG_OVERRIDES_CSWhaproxy += file-with-bad-content|/usr/share|root/opt/csw/share/man/man1/haproxy.1
+CHECKPKG_OVERRIDES_CSWhaproxy += file-with-bad-content|/usr/share|root/opt/csw/share/doc/haproxy/haproxy.1
+CHECKPKG_OVERRIDES_CSWhaproxy += file-with-bad-content|/usr/share|root/opt/csw/share/doc/haproxy/examples/build.cfg
+CHECKPKG_OVERRIDES_CSWhaproxy += file-with-bad-content|/usr/share|root/opt/csw/share/doc/haproxy/examples/haproxy.cfg
+CHECKPKG_OVERRIDES_CSWhaproxy += file-with-bad-content|/usr/share|root/opt/csw/share/doc/haproxy/examples/haproxy-1.1.21-flx.1.pkg
+
+# This is in fact ok for libcrypt.so
+CHECKPKG_OVERRIDES_CSWhaproxy += bad-rpath-entry|/usr/lib/$$ISALIST|opt/csw/sbin/sparcv9/haproxy
+CHECKPKG_OVERRIDES_CSWhaproxy += bad-rpath-entry|/usr/lib/$$ISALIST|opt/csw/sbin/amd64/haproxy
+
 # Heavily optimized, supported for gcc, didn't dare to touch
 GARCOMPILER = GCC4
 
@@ -36,6 +47,9 @@
 CONFIGURE_SCRIPTS =
 TEST_SCRIPTS =
 
+# We specifically need /usr/lib/64
+EXTRA_LIB += /usr/lib
+
 BUILD_ARGS = \
 	TARGET=solaris \
 	CC=$(CC) \
@@ -47,13 +61,6 @@
 	SBINDIR=$(sbindir) \
 	DOCDIR=$(docdir)/$(NAME)
 
-# Don't care for now, investigate later!
-CHECKPKG_OVERRIDES_CSWhaproxy += file-with-bad-content|/usr/share|root/opt/csw/share/man/man1/haproxy.1
-CHECKPKG_OVERRIDES_CSWhaproxy += file-with-bad-content|/usr/share|root/opt/csw/share/doc/haproxy/haproxy.1
-CHECKPKG_OVERRIDES_CSWhaproxy += file-with-bad-content|/usr/share|root/opt/csw/share/doc/haproxy/examples/build.cfg
-CHECKPKG_OVERRIDES_CSWhaproxy += file-with-bad-content|/usr/share|root/opt/csw/share/doc/haproxy/examples/haproxy.cfg
-CHECKPKG_OVERRIDES_CSWhaproxy += file-with-bad-content|/usr/share|root/opt/csw/share/doc/haproxy/examples/haproxy-1.1.21-flx.1.pkg
-
 include gar/category.mk
 
 # Makefile contains references to install

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