SF.net SVN: gar:[23980] csw/mgar/pkg/log4shib/trunk/Makefile

[claudio_sf at users.sourceforge.net]

Revision: 23980
          http://sourceforge.net/p/gar/code/23980
Author:   claudio_sf
Date:     2014-08-13 13:36:56 +0000 (Wed, 13 Aug 2014)
Log Message:
-----------
log4shib/trunk: 64-bit, no -dev split

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

Modified: csw/mgar/pkg/log4shib/trunk/Makefile
===================================================================
--- csw/mgar/pkg/log4shib/trunk/Makefile	2014-08-13 13:03:46 UTC (rev 23979)
+++ csw/mgar/pkg/log4shib/trunk/Makefile	2014-08-13 13:36:56 UTC (rev 23980)
@@ -15,21 +15,26 @@
 RUNTIME_DEP_PKGS_CSWliblog4shib1 += CSWlibstdc++6
 
 GARCOMPILER = GCC4
-#BUILD64 = 1
-#ISAEXEC = 1
+BUILD64 = 1
+ISAEXEC = 1
 #IGNORE_DESTDIR = 1
 # We want 64 bit binaries
 #MERGE_DIRS_isa-extra = $(bindir) $(sbindir) $(libdir) $(libexecdir)
 
-#OVERRIDES
+#OVERRIDES: let not split -dev for now
 CHECKPKG_OVERRIDES_CSWlog4shib += shared-lib-package-contains-so-symlink|file=/opt/csw/lib/liblog4shib.so
 CHECKPKG_OVERRIDES_CSWlog4shib += shared-lib-pkgname-mismatch|file=opt/csw/lib/liblog4shib.so.1.0.8|soname=liblog4shib.so.1|pkgname=CSWlog4shib|expected=CSWliblog4shib1
 CHECKPKG_OVERRIDES_CSWlog4shib += shared-lib-package-contains-so-symlink|file=/opt/csw/lib/liblog4shib.so
+CHECKPKG_OVERRIDES_CSWlog4shib += shared-lib-package-contains-so-symlink|file=/opt/csw/lib/amd64/liblog4shib.so
+#CHECKPKG_OVERRIDES_CSWlog4shib += pkginfo-opencsw-repository-uncommitted
+CHECKPKG_OVERRIDES_CSWlog4shib += shared-lib-pkgname-mismatch|file=opt/csw/lib/amd64/liblog4shib.so.1.0.8|soname=liblog4shib.so.1|pkgname=CSWlog4shib|expected=CSWliblog4shib1
+CHECKPKG_OVERRIDES_CSWlog4shib += shared-lib-package-contains-so-symlink|file=/opt/csw/lib/amd64/liblog4shib.so
 
+
 #CONFIGURE_ARGS = $(DIRPATHS)
 RUNTIME_DEP_PKGS_CSWlog4shib += CSWlibgcc-s1
 RUNTIME_DEP_PKGS_CSWlog4shib += CSWlibstdc++6
-CONFIGURE_ARGS = --disable-static --disable-doxygen --prefix=/opt/csw --mandir=/opt/csw/share/man
+CONFIGURE_ARGS = --disable-static --disable-doxygen --prefix=/opt/csw --mandir=/opt/csw/share/man --libdir=$(libdir)
 
 include gar/category.mk
 

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