"Fossies" - the Fresh Open Source Software Archive

Member "Atom/resources/app/apm/node_modules/node-gyp/0001-gyp-always-install-into-PRODUCT_DIR.patch" (11 Apr 2017, 1548 Bytes) of package /windows/misc/atom-windows.zip:


As a special service "Fossies" has tried to format the requested source page into HTML format using (guessed) Diff source code syntax highlighting (style: standard) with prefixed line numbers. Alternatively you can here view or download the uninterpreted source code file.

    1 From 9b5e8dc426ada891d67d27b09acc73122ab46849 Mon Sep 17 00:00:00 2001
    2 From: Nathan Rajlich <nathan@tootallnate.net>
    3 Date: Wed, 14 Nov 2012 16:48:52 -0800
    4 Subject: [PATCH 1/3] gyp: always install into $PRODUCT_DIR
    5 
    6 ---
    7  gyp/pylib/gyp/generator/make.py | 12 +++++++-----
    8  1 file changed, 7 insertions(+), 5 deletions(-)
    9 
   10 diff --git a/gyp/pylib/gyp/generator/make.py b/gyp/pylib/gyp/generator/make.py
   11 index b88a433..9b3e4e3 100644
   12 --- a/gyp/pylib/gyp/generator/make.py
   13 +++ b/gyp/pylib/gyp/generator/make.py
   14 @@ -1888,11 +1888,13 @@ $(obj).$(TOOLSET)/$(TARGET)/%%.o: $(obj)/%%%s FORCE_DO_CMD
   15      """Returns the location of the final output for an installable target."""
   16      # Xcode puts shared_library results into PRODUCT_DIR, and some gyp files
   17      # rely on this. Emulate this behavior for mac.
   18 -    if (self.type == 'shared_library' and
   19 -        (self.flavor != 'mac' or self.toolset != 'target')):
   20 -      # Install all shared libs into a common directory (per toolset) for
   21 -      # convenient access with LD_LIBRARY_PATH.
   22 -      return '$(builddir)/lib.%s/%s' % (self.toolset, self.alias)
   23 +
   24 +    # XXX(TooTallNate): disabling this code since we don't want this behavior...
   25 +    #if (self.type == 'shared_library' and
   26 +    #    (self.flavor != 'mac' or self.toolset != 'target')):
   27 +    #  # Install all shared libs into a common directory (per toolset) for
   28 +    #  # convenient access with LD_LIBRARY_PATH.
   29 +    #  return '$(builddir)/lib.%s/%s' % (self.toolset, self.alias)
   30      return '$(builddir)/' + self.alias
   31  
   32  
   33 -- 
   34 2.3.2 (Apple Git-55)
   35