[csw-devel] SF.net SVN: gar:[21956] csw/mgar/pkg/samba/branches/samba3/Makefile

[Dagobert Michelsen]

Hi Laurent,

Am 17.09.2013 um 10:51 schrieb lblume at users.sourceforge.net:

> Revision: 21956
>        http://gar.svn.sourceforge.net/gar/?rev=21956&view=rev
> Author:   lblume
> Date:     2013-09-17 08:51:36 +0000 (Tue, 17 Sep 2013)
> Log Message:
> -----------
> samba/branches/samba3: Fix the compiler selection by OS version
> 
> Modified Paths:
> --------------
>  csw/mgar/pkg/samba/branches/samba3/Makefile
> 
> Modified: csw/mgar/pkg/samba/branches/samba3/Makefile
> ===================================================================
> --- csw/mgar/pkg/samba/branches/samba3/Makefile	2013-09-17 08:41:22 UTC (rev 21955)
> +++ csw/mgar/pkg/samba/branches/samba3/Makefile	2013-09-17 08:51:36 UTC (rev 21956)
> @@ -29,9 +29,11 @@
> PATCHFILES += 0003-rename-nss-modules.patch
> 
> # Studio 12 is the last supported on Solaris 9
> -GARCOMPILER-5.9  = SOS12
> -GARCOMPILER-5.10 = SOS12U3
> -GARCOMPILER = $(GARCOMPILER-$(GAROSREL))
> +ifeq ($(shell /usr/bin/uname -r),5.9)
> +  GARCOMPILER = SOS12
> +else
> +  GARCOMPILER = SOS12U3
> +endif

I suggest using

GARCOMPILER_5.9 = SOS12
GARCOMPILER_5.10 = SOS12U3
GARCOMPILER_5.11 = SOS12U3
GARCOMPILER = $(GARCOMPILER_$(GAROSREL))

or

GARCOMPILER_5.9 = SOS12
GARCOMPILER = $(or $(GARCOMPILER_$(GAROSREL)),SOS12U3)

uname -r is already in GAROSREL.


Best regards

-- Dago

> 
> BUILD_DEP_PKGS += CSWlibtalloc-dev
> BUILD_DEP_PKGS += CSWopenldap-dev
> 
> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
> 
> _______________________________________________
> devel mailing list
> devel at lists.opencsw.org
> https://lists.opencsw.org/mailman/listinfo/devel

-- 
"You don't become great by trying to be great, you become great by wanting to do something,
and then doing it so hard that you become great in the process." - xkcd #896

-------------- next part --------------
A non-text attachment was scrubbed...
Name: smime.p7s
Type: application/pkcs7-signature
Size: 2351 bytes
Desc: not available
URL: <http://lists.opencsw.org/pipermail/devel/attachments/20130917/e7bc6434/attachment.p7s>