Re: [csw-devel] SF.net SVN: gar:[15232] csw/mgar/pkg
2011/8/1 Kester Habermann : > Hi Maciej, > > On Sun, Jul 31, 2011 at 11:58:12AM +0100, Maciej Blizi??ski wrote: >> > +install-custom: >> > + ( TCL_INSTDIR=$(DESTDIR)/opt/csw/lib/tcl`echo 'puts $$tcl_version' >> | /opt/csw/bin/tclsh`/$(NAME)$(VERSION) ;\ >> >> If you use $(bindir) instead of /opt/csw/bin, you avoid hardcoding /opt/csw. >> This way, you make it easier to build this package in a different prefix. > > Thanks for the hints again. Before I coded this, I actually looked for a GAR > variable that held the installation prefix (/opt/csw/), but I could not find > one. > The $(bindir) only gives /opt/csw/bin. Is there also something for > /opt/csw/lib/? > In same cases the generic one for /opt/csw/ would also be useful. The variable that holds /opt/csw is $(prefix). Ideally, you would set that variable to something else such as /usr/local, and build into that prefix. For bits like /opt/csw/lib/tcl, I often use $(libdir)/tcl. I hope this helps! Maciej ___ devel mailing list devel@lists.opencsw.org https://lists.opencsw.org/mailman/listinfo/devel
[csw-devel] SF.net SVN: gar:[15233] csw/mgar/pkg/nginx/trunk/Makefile
Revision: 15233 http://gar.svn.sourceforge.net/gar/?rev=15233&view=rev Author: aigoshin Date: 2011-08-01 11:02:54 + (Mon, 01 Aug 2011) Log Message: --- nginx: debugging Modified Paths: -- csw/mgar/pkg/nginx/trunk/Makefile Modified: csw/mgar/pkg/nginx/trunk/Makefile === --- csw/mgar/pkg/nginx/trunk/Makefile 2011-07-29 14:23:37 UTC (rev 15232) +++ csw/mgar/pkg/nginx/trunk/Makefile 2011-08-01 11:02:54 UTC (rev 15233) @@ -50,6 +50,7 @@ sysconfdir=/etc/opt/csw localstatedir=/var/opt/csw +CONFIGURE_ARGS += --with-debug CONFIGURE_ARGS += --with-cpu-opt=$(NGINXCPU) CONFIGURE_ARGS += --with-cc-opt="-I$(includedir) -I$(includedir)/openssl" CONFIGURE_ARGS += --with-ld-opt="$(LDFLAGS)" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. ___ devel mailing list devel@lists.opencsw.org https://lists.opencsw.org/mailman/listinfo/devel
[csw-devel] SF.net SVN: gar:[15234] csw/mgar/pkg/libgmp/trunk/Makefile
Revision: 15234 http://gar.svn.sourceforge.net/gar/?rev=15234&view=rev Author: wahwah Date: 2011-08-01 13:45:46 + (Mon, 01 Aug 2011) Log Message: --- pkg/libgmp/trunk: Removing UFILES_REGEX Modified Paths: -- csw/mgar/pkg/libgmp/trunk/Makefile Property Changed: csw/mgar/pkg/libgmp/trunk/Makefile Modified: csw/mgar/pkg/libgmp/trunk/Makefile === --- csw/mgar/pkg/libgmp/trunk/Makefile 2011-08-01 11:02:54 UTC (rev 15233) +++ csw/mgar/pkg/libgmp/trunk/Makefile 2011-08-01 13:45:46 UTC (rev 15234) @@ -1,3 +1,5 @@ +# $Id$ + NAME = gmp VERSION = 5.0.1 CATEGORIES = lib @@ -22,9 +24,6 @@ SPKG_SOURCEURL = http://gmplib.org/ -# We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.bz2 - #GARCOMPILER = GCC4 BUILD64 = 1 Property changes on: csw/mgar/pkg/libgmp/trunk/Makefile ___ Added: svn:keywords + Id This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. ___ devel mailing list devel@lists.opencsw.org https://lists.opencsw.org/mailman/listinfo/devel
[csw-devel] SF.net SVN: gar:[15235] csw/mgar/pkg/mgar/trunk/Makefile
Revision: 15235 http://gar.svn.sourceforge.net/gar/?rev=15235&view=rev Author: wahwah Date: 2011-08-01 14:32:06 + (Mon, 01 Aug 2011) Log Message: --- pkg/mgar/trunk: Bump up the version to 380 Modified Paths: -- csw/mgar/pkg/mgar/trunk/Makefile Modified: csw/mgar/pkg/mgar/trunk/Makefile === --- csw/mgar/pkg/mgar/trunk/Makefile2011-08-01 13:45:46 UTC (rev 15234) +++ csw/mgar/pkg/mgar/trunk/Makefile2011-08-01 14:32:06 UTC (rev 15235) @@ -1,3 +1,4 @@ +# $Id$ # TODO (release-critical prefixed with !, non release-critical with *) # NAME = mgar @@ -11,7 +12,7 @@ VENDOR_URL = http://gar.opencsw.org SVNROOT= https://opencsw.svn.sourceforge.net/svnroot/opencsw/gar-wrapper -SVNREV = 360 +SVNREV = 380 ARCHALL = 1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. ___ devel mailing list devel@lists.opencsw.org https://lists.opencsw.org/mailman/listinfo/devel
[csw-devel] SF.net SVN: gar:[15236] csw/mgar/pkg/mgar/trunk/Makefile
Revision: 15236 http://gar.svn.sourceforge.net/gar/?rev=15236&view=rev Author: wahwah Date: 2011-08-01 14:33:11 + (Mon, 01 Aug 2011) Log Message: --- pkg/mgar/trunk: Bump the package version to 0.92 Modified Paths: -- csw/mgar/pkg/mgar/trunk/Makefile Modified: csw/mgar/pkg/mgar/trunk/Makefile === --- csw/mgar/pkg/mgar/trunk/Makefile2011-08-01 14:32:06 UTC (rev 15235) +++ csw/mgar/pkg/mgar/trunk/Makefile2011-08-01 14:33:11 UTC (rev 15236) @@ -2,7 +2,7 @@ # TODO (release-critical prefixed with !, non release-critical with *) # NAME = mgar -VERSION = 0.91 +VERSION = 0.92 CATEGORIES = apps DESCRIPTION = Command line interface to the OpenCSW build system This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. ___ devel mailing list devel@lists.opencsw.org https://lists.opencsw.org/mailman/listinfo/devel
[csw-devel] [PATCH] Fix SPKG_DESC duplicate checking
Works around ticket #56. http://sourceforge.net/apps/trac/gar/ticket/56 Previous attempt at fixing it: http://sourceforge.net/apps/trac/gar/changeset/11424 --- gar/v2/gar.pkg.mk |9 - 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/gar/v2/gar.pkg.mk b/gar/v2/gar.pkg.mk index 41495e0..6419b54 100644 --- a/gar/v2/gar.pkg.mk +++ b/gar/v2/gar.pkg.mk @@ -640,9 +640,16 @@ $(if $(filter-out $(firstword $(SPKG_SPECS)),$(SPKG_SPECS)),\ $(foreach P,$(SPKG_SPECS),\ $(if $(SPKG_DESC_$(P)),,$(error Multiple packages defined and SPKG_DESC_$(P) is not set. +# There was a bug here. +# http://sourceforge.net/apps/trac/gar/ticket/56 +# The workaround was to add an additional check whether the strings are the +# same or not. $(foreach P,$(SPKG_SPECS),\ $(foreach Q,$(filter-out $(P) $(OBSOLETED_PKGS),$(SPKG_SPECS)),\ - $(if $(filter-out $(subst ,_,$(SPKG_DESC_$(P))),$(subst ,_,$(SPKG_DESC_$(Q,,$(error The package descriptions for $(P) [$(if $(SPKG_DESC_$(P)),$(SPKG_DESC_$(P)),)] and $(Q) [$(if $(SPKG_DESC_$(Q)),$(SPKG_DESC_$(Q)),)] are identical. Please make sure that all descriptions are unique by setting SPKG_DESC_ for each package. + $(if $(filter-out $(subst ,_,$(SPKG_DESC_$(P))),$(subst ,_,$(SPKG_DESC_$(Q,\ + ,\ + $(if $(shell if [ "$(SPKG_DESC_$(P))" = "$(SPKG_DESC_$(Q))" ]; then echo bad; fi),\ + $(error The package descriptions for $(P) [$(if $(SPKG_DESC_$(P)),$(SPKG_DESC_$(P)),)] and $(Q) [$(if $(SPKG_DESC_$(Q)),$(SPKG_DESC_$(Q)),)] are identical. Please make sure that all descriptions are unique by setting SPKG_DESC_ for each package.), .PRECIOUS: $(WORKDIR)/%.pkginfo -- 1.7.5.4 ___ devel mailing list devel@lists.opencsw.org https://lists.opencsw.org/mailman/listinfo/devel
[csw-devel] SF.net SVN: gar:[15237] csw/mgar/pkg/libgmp3/trunk/Makefile
Revision: 15237 http://gar.svn.sourceforge.net/gar/?rev=15237&view=rev Author: wahwah Date: 2011-08-01 20:03:53 + (Mon, 01 Aug 2011) Log Message: --- pkg/libgmp3/trunk: removing UFILES_REGEX Modified Paths: -- csw/mgar/pkg/libgmp3/trunk/Makefile Modified: csw/mgar/pkg/libgmp3/trunk/Makefile === --- csw/mgar/pkg/libgmp3/trunk/Makefile 2011-08-01 14:33:11 UTC (rev 15236) +++ csw/mgar/pkg/libgmp3/trunk/Makefile 2011-08-01 20:03:53 UTC (rev 15237) @@ -22,9 +22,6 @@ SPKG_SOURCEURL = http://gmplib.org/ -# We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.bz2 - GARCOMPILER = GCC4 BUILD64 = 1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. ___ devel mailing list devel@lists.opencsw.org https://lists.opencsw.org/mailman/listinfo/devel
[csw-devel] SF.net SVN: gar:[15238] csw/mgar/pkg/libgmp/trunk
Revision: 15238 http://gar.svn.sourceforge.net/gar/?rev=15238&view=rev Author: wahwah Date: 2011-08-01 20:06:34 + (Mon, 01 Aug 2011) Log Message: --- pkg/libgmp/trunk: an override for bad content in .info Modified Paths: -- csw/mgar/pkg/libgmp/trunk/Makefile csw/mgar/pkg/libgmp/trunk/checksums Modified: csw/mgar/pkg/libgmp/trunk/Makefile === --- csw/mgar/pkg/libgmp/trunk/Makefile 2011-08-01 20:03:53 UTC (rev 15237) +++ csw/mgar/pkg/libgmp/trunk/Makefile 2011-08-01 20:06:34 UTC (rev 15238) @@ -1,7 +1,7 @@ # $Id$ NAME = gmp -VERSION = 5.0.1 +VERSION = 5.0.2 CATEGORIES = lib DESCRIPTION = GNU Multiple Precision Arithmetic Library @@ -76,6 +76,9 @@ # We have collisions with legacy CSWlibgmp until re-release CHECKPKG_OVERRIDES_CSWlibgmp-dev += file-collision +# It's only an .info file. +CHECKPKG_OVERRIDES_CSWlibgmp-dev += file-with-bad-content|/usr/local|root/opt/csw/share/info/gmp.info-1 + include gar/category.mk #ifeq ($(ISA), sparcv8plus) Modified: csw/mgar/pkg/libgmp/trunk/checksums === --- csw/mgar/pkg/libgmp/trunk/checksums 2011-08-01 20:03:53 UTC (rev 15237) +++ csw/mgar/pkg/libgmp/trunk/checksums 2011-08-01 20:06:34 UTC (rev 15238) @@ -1 +1 @@ -6bac6df75c192a13419dfd71d19240a7 gmp-5.0.1.tar.bz2 +0bbaedc82fb30315b06b1588b9077cd3 gmp-5.0.2.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. ___ devel mailing list devel@lists.opencsw.org https://lists.opencsw.org/mailman/listinfo/devel
[csw-devel] SF.net SVN: gar:[15239] csw/mgar/pkg/libgmp3/trunk/Makefile
Revision: 15239 http://gar.svn.sourceforge.net/gar/?rev=15239&view=rev Author: wahwah Date: 2011-08-01 20:07:49 + (Mon, 01 Aug 2011) Log Message: --- pkg/libgmp3/trunk: splitting off a dev package to be later replaced Modified Paths: -- csw/mgar/pkg/libgmp3/trunk/Makefile Modified: csw/mgar/pkg/libgmp3/trunk/Makefile === --- csw/mgar/pkg/libgmp3/trunk/Makefile 2011-08-01 20:06:34 UTC (rev 15238) +++ csw/mgar/pkg/libgmp3/trunk/Makefile 2011-08-01 20:07:49 UTC (rev 15239) @@ -59,6 +59,13 @@ # This is a legacy package, tolerate the wrong name until this is obsoleted CHECKPKG_OVERRIDES_CSWlibgmp += shared-lib-pkgname-mismatch +PACKAGES += CSWlibgmp-dev +CATALOGNAME_CSWlibgmp-dev = libgmp_dev +SPKG_DESC_CSWlibgmp-dev = GNU Multiple Precision Arithmetic Library, development files +RUNTIME_DEP_PKGS_CSWlibgmp-dev += CSWlibgmp +# /usr/local mentioned content in .info file. +CHECKPKG_OVERRIDES_CSWlibgmp-dev += file-with-bad-content|/usr/local|root/opt/csw/share/info/gmp.info-1 + RUNTIME_DEP_PKGS = CSWgcc4corert include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. ___ devel mailing list devel@lists.opencsw.org https://lists.opencsw.org/mailman/listinfo/devel
[csw-devel] SF.net SVN: gar:[15240] csw/mgar/pkg/libgmp/trunk/Makefile
Revision: 15240 http://gar.svn.sourceforge.net/gar/?rev=15240&view=rev Author: wahwah Date: 2011-08-01 22:50:24 + (Mon, 01 Aug 2011) Log Message: --- pkg/libgmp/trunk: thanks to the dev package split, file collisions are gone Modified Paths: -- csw/mgar/pkg/libgmp/trunk/Makefile Modified: csw/mgar/pkg/libgmp/trunk/Makefile === --- csw/mgar/pkg/libgmp/trunk/Makefile 2011-08-01 20:07:49 UTC (rev 15239) +++ csw/mgar/pkg/libgmp/trunk/Makefile 2011-08-01 22:50:24 UTC (rev 15240) @@ -73,9 +73,6 @@ #RUNTIME_DEP_PKGS = CSWgcc4corert -# We have collisions with legacy CSWlibgmp until re-release -CHECKPKG_OVERRIDES_CSWlibgmp-dev += file-collision - # It's only an .info file. CHECKPKG_OVERRIDES_CSWlibgmp-dev += file-with-bad-content|/usr/local|root/opt/csw/share/info/gmp.info-1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. ___ devel mailing list devel@lists.opencsw.org https://lists.opencsw.org/mailman/listinfo/devel
[csw-devel] SF.net SVN: gar:[15241] csw/mgar/pkg/gcc4/trunk
Revision: 15241 http://gar.svn.sourceforge.net/gar/?rev=15241&view=rev Author: wahwah Date: 2011-08-02 06:14:45 + (Tue, 02 Aug 2011) Log Message: --- pkg/gcc4/trunk: version bump to 4.6.1, other small changes, does not build yet Modified Paths: -- csw/mgar/pkg/gcc4/trunk/Makefile csw/mgar/pkg/gcc4/trunk/checksums csw/mgar/pkg/gcc4/trunk/files/gar_override.mk csw/mgar/pkg/gcc4/trunk/files/package_def.mk Property Changed: csw/mgar/pkg/gcc4/trunk/Makefile Modified: csw/mgar/pkg/gcc4/trunk/Makefile === --- csw/mgar/pkg/gcc4/trunk/Makefile2011-08-01 22:50:24 UTC (rev 15240) +++ csw/mgar/pkg/gcc4/trunk/Makefile2011-08-02 06:14:45 UTC (rev 15241) @@ -1,6 +1,9 @@ +# $Id$ + NAME = gcc -VERSION = 4.5.0 +VERSION = 4.6.1 CATEGORIES = lang +GARTYPE = v2 DESCRIPTION = The GNU Compiler Collection define BLURB @@ -12,10 +15,6 @@ DISTFILES= $(NAME)-$(VERSION).tar.bz2 MASTER_SITES = $(GNU_MIRROR)/$(NAME)-$(VERSION)/ -# We define upstream file regex so we can be notifed -# of new upstream software release -UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.bz2 - PACKAGING_PLATFORMS = solaris9-sparc solaris9-i386 PACKAGING_PLATFORMS += solaris10-sparc solaris10-i386 Property changes on: csw/mgar/pkg/gcc4/trunk/Makefile ___ Added: svn:keywords + Id Modified: csw/mgar/pkg/gcc4/trunk/checksums === --- csw/mgar/pkg/gcc4/trunk/checksums 2011-08-01 22:50:24 UTC (rev 15240) +++ csw/mgar/pkg/gcc4/trunk/checksums 2011-08-02 06:14:45 UTC (rev 15241) @@ -1,2 +1 @@ -9883bd7887c22e1180b9dae4f2acd8ec CSWgcc4core.space -ff27b7c4a5d5060c8a8543a44abca31f gcc-4.5.0.tar.bz2 +c57a9170c677bf795bdc04ed796ca491 gcc-4.6.1.tar.bz2 Modified: csw/mgar/pkg/gcc4/trunk/files/gar_override.mk === --- csw/mgar/pkg/gcc4/trunk/files/gar_override.mk 2011-08-01 22:50:24 UTC (rev 15240) +++ csw/mgar/pkg/gcc4/trunk/files/gar_override.mk 2011-08-02 06:14:45 UTC (rev 15241) @@ -40,6 +40,6 @@ post-configure-modulated: fix-bootflags MERGE_SCRIPTS_isa-i386 = amd -## Run checkpkg Manually -ENABLE_CHECK= 0 - +# This should not be necessary any more thanks to checkpkg overrides. +# ## Run checkpkg Manually +# ENABLE_CHECK= 0 Modified: csw/mgar/pkg/gcc4/trunk/files/package_def.mk === --- csw/mgar/pkg/gcc4/trunk/files/package_def.mk2011-08-01 22:50:24 UTC (rev 15240) +++ csw/mgar/pkg/gcc4/trunk/files/package_def.mk2011-08-02 06:14:45 UTC (rev 15241) @@ -1,7 +1,16 @@ ### Package Section ### -PACKAGES = CSWgcc4ada CSWgcc4adart CSWgcc4gfortran CSWgcc4gfortranrt -PACKAGES += CSWgcc4java CSWgcc4javart CSWgcc4objc CSWgcc4objcrt -PACKAGES += CSWgcc4g++ CSWgcc4g++rt CSWgcc4corert CSWgcc4core +PACKAGES = CSWgcc4ada +PACKAGES += CSWgcc4adart +PACKAGES += CSWgcc4core +PACKAGES += CSWgcc4corert +PACKAGES += CSWgcc4g++ +PACKAGES += CSWgcc4g++rt +PACKAGES += CSWgcc4gfortran +PACKAGES += CSWgcc4gfortranrt +PACKAGES += CSWgcc4java +PACKAGES += CSWgcc4javart +PACKAGES += CSWgcc4objc +PACKAGES += CSWgcc4objcrt ## Define Package Catalog Names CATALOGNAME_CSWgcc4ada= gcc4ada This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. ___ devel mailing list devel@lists.opencsw.org https://lists.opencsw.org/mailman/listinfo/devel
