Hello community, here is the log from the commit of package gyp for openSUSE:Factory checked in at 2016-03-26 15:09:52 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gyp (Old) and /work/SRC/openSUSE:Factory/.gyp.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gyp" Changes: -------- --- /work/SRC/openSUSE:Factory/gyp/gyp.changes 2016-03-16 10:43:25.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.gyp.new/gyp.changes 2016-03-26 15:09:53.000000000 +0100 @@ -1,0 +2,16 @@ +Sun Mar 20 09:08:17 UTC 2016 - [email protected] + +- Update to version 0~git.20160318: + + Revert "Update Xcode emulation extra plist items." + + Re-land update Xcode emulation extra plist items for Xcode 7.2 + + Support sdk_version of None. + + Don't recompute environment for mac bundles unnecessarily. + + Make login.keychain and 'Provisioning Profiles' symlinks. + + Fix tests with Xcode 7. + + Xcode-ninja: Add excluded files to the project sources_for_indexing.xcodeproj + + ninja/win: Use qualified paths for precompiled headers. + + Adjust pretty_gyp to align comments with the appropriate braces. + + ninja: Add target_rpath generator flag +- Small spec file cleanup + +------------------------------------------------------------------- Old: ---- gyp-0~git.20160304.tar.xz New: ---- gyp-0~git.20160318.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gyp.spec ++++++ --- /var/tmp/diff_new_pack.u7yK4c/_old 2016-03-26 15:09:54.000000000 +0100 +++ /var/tmp/diff_new_pack.u7yK4c/_new 2016-03-26 15:09:54.000000000 +0100 @@ -17,8 +17,10 @@ # +%define version_unconverted 0~git.20160318 + Name: gyp -Version: 0~git.20160304 +Version: 0~git.20160318 Release: 0 Summary: Generate Your Projects License: BSD-3-Clause @@ -52,13 +54,13 @@ %install python setup.py install --root %{buildroot} --prefix=%{_prefix} -%fdupes %{buildroot}%{python_sitelib} +%fdupes -s %{buildroot}%{python_sitelib} %files %defattr(-,root,root,-) %doc AUTHORS LICENSE -%dir %{python_sitelib}/%{name} -%{python_sitelib}/* %{_bindir}/%{name} +%{python_sitelib}/%{name} +%{python_sitelib}/%{name}-*-py%{py_ver}.egg-info %changelog ++++++ gyp-0~git.20160304.tar.xz -> gyp-0~git.20160318.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gyp-0~git.20160304/AUTHORS new/gyp-0~git.20160318/AUTHORS --- old/gyp-0~git.20160304/AUTHORS 2016-03-09 17:33:09.000000000 +0100 +++ new/gyp-0~git.20160318/AUTHORS 2016-03-20 10:08:16.000000000 +0100 @@ -10,3 +10,4 @@ David J. Sankel <[email protected]> Eric N. Vander Weele <[email protected]> Tom Freudenberg <[email protected]> +Julien Brianceau <[email protected]> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gyp-0~git.20160304/pylib/gyp/generator/ninja.py new/gyp-0~git.20160318/pylib/gyp/generator/ninja.py --- old/gyp-0~git.20160304/pylib/gyp/generator/ninja.py 2016-03-09 17:33:09.000000000 +0100 +++ new/gyp-0~git.20160318/pylib/gyp/generator/ninja.py 2016-03-20 10:08:16.000000000 +0100 @@ -379,6 +379,8 @@ # should be used for linking. self.uses_cpp = False + self.target_rpath = generator_flags.get('target_rpath', r'\$$ORIGIN/lib/') + self.is_mac_bundle = gyp.xcode_emulation.IsMacBundle(self.flavor, spec) self.xcode_settings = self.msvs_settings = None if self.flavor == 'mac': @@ -1193,7 +1195,9 @@ rpath = 'lib/' if self.toolset != 'target': rpath += self.toolset - ldflags.append(r'-Wl,-rpath=\$$ORIGIN/%s' % rpath) + ldflags.append(r'-Wl,-rpath=\$$ORIGIN/%s' % rpath) + else: + ldflags.append('-Wl,-rpath=%s' % self.target_rpath) ldflags.append('-Wl,-rpath-link=%s' % rpath) self.WriteVariableList(ninja_file, 'ldflags', map(self.ExpandSpecial, ldflags)) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gyp-0~git.20160304/test/linux/gyptest-target-rpath.py new/gyp-0~git.20160318/test/linux/gyptest-target-rpath.py --- old/gyp-0~git.20160304/test/linux/gyptest-target-rpath.py 1970-01-01 01:00:00.000000000 +0100 +++ new/gyp-0~git.20160318/test/linux/gyptest-target-rpath.py 2016-03-20 10:08:16.000000000 +0100 @@ -0,0 +1,43 @@ +#!/usr/bin/env python + +# Copyright (c) 2013 Google Inc. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +""" +Check target_rpath generator flag for ninja. +""" + +import TestGyp + +import re +import subprocess +import sys + +if sys.platform.startswith('linux'): + test = TestGyp.TestGyp(formats=['ninja']) + + CHDIR = 'target-rpath' + test.run_gyp('test.gyp', '-G', 'target_rpath=/usr/lib/gyptest/', chdir=CHDIR) + test.build('test.gyp', test.ALL, chdir=CHDIR) + + def GetRpaths(p): + p = test.built_file_path(p, chdir=CHDIR) + r = re.compile(r'Library rpath: \[([^\]]+)\]') + proc = subprocess.Popen(['readelf', '-d', p], stdout=subprocess.PIPE) + o = proc.communicate()[0] + assert not proc.returncode + return r.findall(o) + + expect = '/usr/lib/gyptest/' + + if GetRpaths('shared_executable') != [expect]: + test.fail_test() + + if GetRpaths('shared_executable_no_so_suffix') != [expect]: + test.fail_test() + + if GetRpaths('static_executable'): + test.fail_test() + + test.pass_test() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gyp-0~git.20160304/test/linux/target-rpath/file.c new/gyp-0~git.20160318/test/linux/target-rpath/file.c --- old/gyp-0~git.20160304/test/linux/target-rpath/file.c 1970-01-01 01:00:00.000000000 +0100 +++ new/gyp-0~git.20160318/test/linux/target-rpath/file.c 2016-03-20 10:08:16.000000000 +0100 @@ -0,0 +1 @@ +void f() {} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gyp-0~git.20160304/test/linux/target-rpath/main.c new/gyp-0~git.20160318/test/linux/target-rpath/main.c --- old/gyp-0~git.20160304/test/linux/target-rpath/main.c 1970-01-01 01:00:00.000000000 +0100 +++ new/gyp-0~git.20160318/test/linux/target-rpath/main.c 2016-03-20 10:08:16.000000000 +0100 @@ -0,0 +1 @@ +int main() {} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gyp-0~git.20160304/test/linux/target-rpath/test.gyp new/gyp-0~git.20160318/test/linux/target-rpath/test.gyp --- old/gyp-0~git.20160304/test/linux/target-rpath/test.gyp 1970-01-01 01:00:00.000000000 +0100 +++ new/gyp-0~git.20160318/test/linux/target-rpath/test.gyp 2016-03-20 10:08:16.000000000 +0100 @@ -0,0 +1,47 @@ +# Copyright (c) 2013 Google Inc. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. +{ + 'targets': [ + { + 'target_name': 'shared', + 'type': 'shared_library', + 'sources': [ 'file.c' ], + }, + { + 'target_name': 'shared_no_so_suffix', + 'product_extension': 'so.0.1', + 'type': 'shared_library', + 'sources': [ 'file.c' ], + }, + { + 'target_name': 'static', + 'type': 'static_library', + 'sources': [ 'file.c' ], + }, + { + 'target_name': 'shared_executable', + 'type': 'executable', + 'sources': [ 'main.c' ], + 'dependencies': [ + 'shared', + ] + }, + { + 'target_name': 'shared_executable_no_so_suffix', + 'type': 'executable', + 'sources': [ 'main.c' ], + 'dependencies': [ + 'shared_no_so_suffix', + ] + }, + { + 'target_name': 'static_executable', + 'type': 'executable', + 'sources': [ 'main.c' ], + 'dependencies': [ + 'static', + ] + }, + ], +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gyp-0~git.20160304/tools/pretty_gyp.py new/gyp-0~git.20160318/tools/pretty_gyp.py --- old/gyp-0~git.20160304/tools/pretty_gyp.py 2016-03-09 17:33:09.000000000 +0100 +++ new/gyp-0~git.20160318/tools/pretty_gyp.py 2016-03-20 10:08:16.000000000 +0100 @@ -118,24 +118,23 @@ basic_offset = 2 last_line = "" for line in lines: - if COMMENT_RE.match(line): - print line - else: - line = line.strip('\r\n\t ') # Otherwise doesn't strip \r on Unix. - if len(line) > 0: + line = line.strip('\r\n\t ') # Otherwise doesn't strip \r on Unix. + if len(line) > 0: + brace_diff = 0 + if not COMMENT_RE.match(line): (brace_diff, after) = count_braces(line) - if brace_diff != 0: - if after: - print " " * (basic_offset * indent) + line - indent += brace_diff - else: - indent += brace_diff - print " " * (basic_offset * indent) + line + if brace_diff != 0: + if after: + print " " * (basic_offset * indent) + line + indent += brace_diff else: + indent += brace_diff print " " * (basic_offset * indent) + line else: - print "" - last_line = line + print " " * (basic_offset * indent) + line + else: + print "" + last_line = line def main(): ++++++ gyp-rpmoptflags.patch ++++++ --- /var/tmp/diff_new_pack.u7yK4c/_old 2016-03-26 15:09:55.000000000 +0100 +++ /var/tmp/diff_new_pack.u7yK4c/_new 2016-03-26 15:09:55.000000000 +0100 @@ -1,7 +1,8 @@ -diff -pruN gyp.orig/pylib/gyp/generator/make.py gyp/pylib/gyp/generator/make.py ---- gyp.orig/pylib/gyp/generator/make.py 2011-08-23 16:47:59.000000000 +0900 -+++ gyp/pylib/gyp/generator/make.py 2011-08-23 17:31:13.000000000 +0900 -@@ -1554,6 +1554,7 @@ $(obj).$(TOOLSET)/$(TARGET)/%%.o: $(obj) +Index: gyp-0~git.20160318/pylib/gyp/generator/make.py +=================================================================== +--- gyp-0~git.20160318.orig/pylib/gyp/generator/make.py ++++ gyp-0~git.20160318/pylib/gyp/generator/make.py +@@ -1183,6 +1183,7 @@ $(obj).$(TOOLSET)/$(TARGET)/%%.o: $(obj) # Write configuration-specific variables for CFLAGS, etc. for configname in sorted(configs.keys()): config = configs[configname] @@ -9,7 +10,7 @@ self.WriteList(config.get('defines'), 'DEFS_%s' % configname, prefix='-D', quoter=EscapeCppDefine) -@@ -1565,8 +1566,20 @@ $(obj).$(TOOLSET)/$(TARGET)/%%.o: $(obj) +@@ -1194,8 +1195,20 @@ $(obj).$(TOOLSET)/$(TARGET)/%%.o: $(obj) cflags_objcc = self.xcode_settings.GetCflagsObjCC(configname) else: cflags = config.get('cflags')
