[131817] trunk/dports/_resources/port1.0/group/gobject_introspection-1.0. tcl

Jeremy Huddleston Sequoia jeremyhu at macports.org
Mon Jan 19 09:42:14 PST 2015


Don't we need to set destroot-args as well, or was the bug that necessitated that (rebuilding the gir during destroot phase) fixed?

Index: gobject_introspection-1.0.tcl
===================================================================
--- gobject_introspection-1.0.tcl	(revision 131831)
+++ gobject_introspection-1.0.tcl	(working copy)
@@ -79,10 +79,12 @@
         if {[info exists universal_archs_to_use]} {
             global merger_build_args
             foreach arch ${universal_archs_to_use} {
-                lappend merger_build_args(${arch})  CC='${configure.cc} -arch ${arch}'
+                lappend merger_build_args(${arch})     CC='${configure.cc} -arch ${arch}'
+                lappend merger_destroot_args(${arch})  CC='${configure.cc} -arch ${arch}'
             }
         } else {
-            build.args-append   CC="${configure.cc} ${configure.cc_archflags}"
+            build.args-append      CC="${configure.cc} ${configure.cc_archflags}"
+            destroot.args-append   CC="${configure.cc} ${configure.cc_archflags}"
         }
 
         # The rules enabled by gobject-introspection require GNU make 3.81+

> On Jan 19, 2015, at 03:03, devans at macports.org wrote:
> 
> Revision
> 131817
> Author
> devans at macports.org
> Date
> 2015-01-19 03:03:21 -0800 (Mon, 19 Jan 2015)
> Log Message
> 
> gobject_introspection-1.0.tcl: add new portgroup gobject_introspection (#45263).
> Added Paths
> 
> 	• trunk/dports/_resources/port1.0/group/gobject_introspection-1.0.tcl
> Diff
> 
> Added: trunk/dports/_resources/port1.0/group/gobject_introspection-1.0.tcl (0 => 131817)
> 
> --- trunk/dports/_resources/port1.0/group/gobject_introspection-1.0.tcl	                        (rev 0)
> +++ trunk/dports/_resources/port1.0/group/gobject_introspection-1.0.tcl	2015-01-19 11:03:21 UTC (rev 131817)
> 
> @@ -0,0 +1,93 @@
> 
> +# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
> +# $Id$
> +#
> +# Copyright (c) 2014 The MacPorts Project
> +# All rights reserved.
> +#
> +# Redistribution and use in source and binary forms, with or without
> +# modification, are permitted provided that the following conditions are
> +# met:
> +#
> +# 1. Redistributions of source code must retain the above copyright
> +#    notice, this list of conditions and the following disclaimer.
> +# 2. Redistributions in binary form must reproduce the above copyright
> +#    notice, this list of conditions and the following disclaimer in the
> +#    documentation and/or other materials provided with the distribution.
> +# 3. Neither the name of The MacPorts Project nor the names of its
> +#    contributors may be used to endorse or promote products derived from
> +#    this software without specific prior written permission.
> +#
> +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
> +# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
> +# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
> +# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
> +# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
> +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
> +# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
> +# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
> +# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
> +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
> +# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
> +#
> +#
> +# This PortGroup adds dependencies and arguments for building with gobject
> +# introspection. There is just one option to set:
> +#
> +# gobject_introspection: whether to use gobject introspection. The default
> +# is no. Possible values are yes and no.
> +#
> +# It is imperative to either set this option *after* you set the port's
> +# dependencies, not before, or alternately, ensure you always append to
> +# dependencies rather than overwriting them. Otherwise you'll overwrite
> +# the dependencies the portgroup sets.
> +
> +options gobject_introspection
> +default gobject_introspection   no
> +option_proc gobject_introspection gobject_introspection._set
> +
> +proc gobject_introspection._set {option action args} {
> +    if {"set" ne ${action}} {
> +        return
> +    }
> +
> +    if {${args}} {
> +        depends_lib-append      port:gobject-introspection
> +
> +        platform darwin 8 {
> +            depends_build-append port:gmake
> +        }
> +    } else {
> +        depends_lib-delete      port:gobject-introspection
> +
> +        platform darwin 8 {
> +            depends_build-delete port:gmake
> +        }
> +    }
> +}
> +
> +pre-configure {
> +    if {${gobject_introspection}} {
> +        configure.args-append   --enable-introspection
> +    } else {
> +        configure.args-append   --disable-introspection
> +    }
> +}
> +
> +pre-build {
> +    if {${gobject_introspection}} {
> +        # gobject-introspection uses g-ir-scanner, which uses $CC from env
> +        if {[info exists universal_archs_to_use]} {
> +            global merger_build_args
> +            foreach arch ${universal_archs_to_use} {
> +                lappend merger_build_args(${arch})  CC='${
> configure.cc
> } -arch ${arch}'
> +            }
> +        } else {
> +            build.args-append   CC="${
> configure.cc} ${configure.cc
> _archflags}"
> +        }
> +
> +        # The rules enabled by gobject-introspection require GNU make 3.81+
> +        platform darwin 8 {
> +            build.cmd-replace   [portbuild::build_getmaketype] ${prefix}/bin/gmake
> +        }
> +    }
> +}
> 
> _______________________________________________
> macports-changes mailing list
> macports-changes at lists.macosforge.org
> https://lists.macosforge.org/mailman/listinfo/macports-changes

-------------- next part --------------
A non-text attachment was scrubbed...
Name: smime.p7s
Type: application/pkcs7-signature
Size: 4145 bytes
Desc: not available
URL: <https://lists.macosforge.org/pipermail/macports-dev/attachments/20150119/7d1a3147/attachment-0001.p7s>


More information about the macports-dev mailing list