SF.net SVN: gar:[26632] csw/mgar/pkg/r/trunk/Makefile

[dmichelsen at users.sourceforge.net]

Revision: 26632
          http://sourceforge.net/p/gar/code/26632
Author:   dmichelsen
Date:     2020-04-29 07:00:29 +0000 (Wed, 29 Apr 2020)
Log Message:
-----------
r/trunk: Fix dependency and some cleanup

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

Modified: csw/mgar/pkg/r/trunk/Makefile
===================================================================
--- csw/mgar/pkg/r/trunk/Makefile	2020-04-27 20:47:45 UTC (rev 26631)
+++ csw/mgar/pkg/r/trunk/Makefile	2020-04-29 07:00:29 UTC (rev 26632)
@@ -10,8 +10,10 @@
 MASTER_SITES = http://stat.ethz.ch/CRAN/src/base/R-$(shell echo $(VERSION) | awk -F. '{print $$1}')/
 DISTFILES += $(NAME)-$(VERSION).tar.gz
 
-VENDOR_URL     = http://www.r-project.org/
+PATCHFILES += 0000-Solaris-does-not-have-a-good-utimensat.patch
 
+VENDOR_URL = http://www.r-project.org/
+
 BUILD_DEP_PKGS += CSWadobereader
 
 PACKAGES += CSWr-base
@@ -63,12 +65,10 @@
 
 # This is x86 only
 RUNTIME_DEP_PKGS_CSWr-base-i386  += CSWlibquadmath0
+RUNTIME_DEP_PKGS_CSWr-base += $(RUNTIME_DEP_PKGS_CSWr-base-$(GARCH))
 
-CHECKPKG_OVERRIDES_CSWr-base += $(CHECKPKG_OVERRIDES_CSWr-base-$(GARCH))
-
 # Temporary overrides
 CHECKPKG_OVERRIDES_CSWr-base += file-with-bad-content
-#CHECKPKG_OVERRIDES_CSWr-base += bad-rpath-entry
 
 # There is a special wrapper that takes care of finding the sonames.
 CHECKPKG_OVERRIDES_CSWr-base += soname-not-found|libRblas.so|is|needed|by|opt/csw/lib/R/bin/exec/R
@@ -123,8 +123,6 @@
 
 TEST_TARGET = check-recommended
 
-PATCHFILES += 0000-Solaris-does-not-have-a-good-utimensat.patch
-
 INTERNET_LIBS = -lsocket -lnsl
 EXTRA_COMMON_EXPORTS += INTERNET_LIBS
 

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