diff --git a/0001-gyp-always-install-into-PRODUCT_DIR.patch b/0001-gyp-always-install-into-PRODUCT_DIR.patch deleted file mode 100644 index 694913f595..0000000000 --- a/0001-gyp-always-install-into-PRODUCT_DIR.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 9b5e8dc426ada891d67d27b09acc73122ab46849 Mon Sep 17 00:00:00 2001 -From: Nathan Rajlich -Date: Wed, 14 Nov 2012 16:48:52 -0800 -Subject: [PATCH 1/3] gyp: always install into $PRODUCT_DIR - ---- - gyp/pylib/gyp/generator/make.py | 12 +++++++----- - 1 file changed, 7 insertions(+), 5 deletions(-) - -diff --git a/gyp/pylib/gyp/generator/make.py b/gyp/pylib/gyp/generator/make.py -index b88a433..9b3e4e3 100644 ---- a/gyp/pylib/gyp/generator/make.py -+++ b/gyp/pylib/gyp/generator/make.py -@@ -1888,11 +1888,13 @@ $(obj).$(TOOLSET)/$(TARGET)/%%.o: $(obj)/%%%s FORCE_DO_CMD - """Returns the location of the final output for an installable target.""" - # Xcode puts shared_library results into PRODUCT_DIR, and some gyp files - # rely on this. Emulate this behavior for mac. -- if (self.type == 'shared_library' and -- (self.flavor != 'mac' or self.toolset != 'target')): -- # Install all shared libs into a common directory (per toolset) for -- # convenient access with LD_LIBRARY_PATH. -- return '$(builddir)/lib.%s/%s' % (self.toolset, self.alias) -+ -+ # XXX(TooTallNate): disabling this code since we don't want this behavior... -+ #if (self.type == 'shared_library' and -+ # (self.flavor != 'mac' or self.toolset != 'target')): -+ # # Install all shared libs into a common directory (per toolset) for -+ # # convenient access with LD_LIBRARY_PATH. -+ # return '$(builddir)/lib.%s/%s' % (self.toolset, self.alias) - return '$(builddir)/' + self.alias - - --- -2.3.2 (Apple Git-55) - diff --git a/0002-gyp-apply-https-codereview.chromium.org-11361103.patch b/0002-gyp-apply-https-codereview.chromium.org-11361103.patch deleted file mode 100644 index d1c5cac717..0000000000 --- a/0002-gyp-apply-https-codereview.chromium.org-11361103.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 511840e82116662aa825088fb8a52a9f799f7767 Mon Sep 17 00:00:00 2001 -From: Nathan Rajlich -Date: Wed, 14 Nov 2012 16:54:04 -0800 -Subject: [PATCH 2/3] gyp: apply https://codereview.chromium.org/11361103/ - ---- - gyp/pylib/gyp/generator/msvs.py | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/gyp/pylib/gyp/generator/msvs.py b/gyp/pylib/gyp/generator/msvs.py -index d8e0872..c59aea1 100644 ---- a/gyp/pylib/gyp/generator/msvs.py -+++ b/gyp/pylib/gyp/generator/msvs.py -@@ -2720,6 +2720,9 @@ def _GetMSBuildAttributes(spec, config, build_file): - product_name = spec.get('product_name', '$(ProjectName)') - target_name = prefix + product_name - msbuild_attributes['TargetName'] = target_name -+ if 'TargetExt' not in msbuild_attributes and 'product_extension' in spec: -+ ext = spec.get('product_extension') -+ msbuild_attributes['TargetExt'] = '.' + ext - - if spec.get('msvs_external_builder'): - external_out_dir = spec.get('msvs_external_builder_out_dir', '.') -@@ -2773,6 +2776,9 @@ def _GetMSBuildConfigurationGlobalProperties(spec, configurations, build_file): - attributes['OutputDirectory']) - _AddConditionalProperty(properties, condition, 'TargetName', - attributes['TargetName']) -+ if 'TargetExt' in attributes: -+ _AddConditionalProperty(properties, condition, 'TargetExt', -+ attributes['TargetExt']) - - if attributes.get('TargetPath'): - _AddConditionalProperty(properties, condition, 'TargetPath', --- -2.3.2 (Apple Git-55) - diff --git a/0003-gyp-don-t-use-links-at-all-just-copy-the-files-inste.patch b/0003-gyp-don-t-use-links-at-all-just-copy-the-files-inste.patch deleted file mode 100644 index 673a3ddd38..0000000000 --- a/0003-gyp-don-t-use-links-at-all-just-copy-the-files-inste.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 0cd9f08a6d4f4be6643001b6c3b5ad40e094bdcc Mon Sep 17 00:00:00 2001 -From: Nathan Zadoks -Date: Tue, 2 Jul 2013 11:07:16 -0700 -Subject: [PATCH 3/3] gyp: don't use links at all, just copy the files instead - ---- - gyp/pylib/gyp/generator/make.py | 2 +- - gyp/pylib/gyp/generator/ninja.py | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/gyp/pylib/gyp/generator/make.py b/gyp/pylib/gyp/generator/make.py -index 9b3e4e3..b3f8a2b 100644 ---- a/gyp/pylib/gyp/generator/make.py -+++ b/gyp/pylib/gyp/generator/make.py -@@ -372,7 +372,7 @@ cmd_touch = touch $@ - - quiet_cmd_copy = COPY $@ - # send stderr to /dev/null to ignore messages when linking directories. --cmd_copy = ln -f "$<" "$@" 2>/dev/null || (rm -rf "$@" && cp -af "$<" "$@") -+cmd_copy = rm -rf "$@" && cp -af "$<" "$@" - - %(link_commands)s - """ -diff --git a/gyp/pylib/gyp/generator/ninja.py b/gyp/pylib/gyp/generator/ninja.py -index 7461814..c2951a4 100644 ---- a/gyp/pylib/gyp/generator/ninja.py -+++ b/gyp/pylib/gyp/generator/ninja.py -@@ -2020,7 +2020,7 @@ def GenerateOutputForConfig(target_list, target_dicts, data, params, - master_ninja.rule( - 'copy', - description='COPY $in $out', -- command='ln -f $in $out 2>/dev/null || (rm -rf $out && cp -af $in $out)') -+ command='rm -rf $out && cp -af $in $out') - master_ninja.newline() - - all_targets = set() --- -2.3.2 (Apple Git-55) -