uboot: (firmwareOdroidC2/C4) don't invoke patch tool, use patches = [] instead
https://github.com/NixOS/nixpkgs/blob/master/pkgs/stdenv/generic/setup.sh#L948 this can do it nicely. Signed-off-by: Anton Arapov <anton@deadbeef.mx>
This commit is contained in:
commit
56de2bcd43
30691 changed files with 3076956 additions and 0 deletions
28
pkgs/development/python-modules/gyp/default.nix
Normal file
28
pkgs/development/python-modules/gyp/default.nix
Normal file
|
|
@ -0,0 +1,28 @@
|
|||
{ lib, stdenv
|
||||
, buildPythonPackage
|
||||
, fetchFromGitiles
|
||||
}:
|
||||
|
||||
buildPythonPackage {
|
||||
pname = "gyp";
|
||||
version = "2020-05-12";
|
||||
|
||||
src = fetchFromGitiles {
|
||||
url = "https://chromium.googlesource.com/external/gyp";
|
||||
rev = "caa60026e223fc501e8b337fd5086ece4028b1c6";
|
||||
sha256 = "0r9phq5yrmj968vdvy9vivli35wn1j9a6iwshp69wl7q4p0x8q2b";
|
||||
};
|
||||
|
||||
patches = lib.optionals stdenv.isDarwin [
|
||||
./no-darwin-cflags.patch
|
||||
./no-xcode.patch
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A tool to generate native build files";
|
||||
homepage = "https://chromium.googlesource.com/external/gyp/+/master/README.md";
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ codyopel ];
|
||||
};
|
||||
|
||||
}
|
||||
40
pkgs/development/python-modules/gyp/no-darwin-cflags.patch
Normal file
40
pkgs/development/python-modules/gyp/no-darwin-cflags.patch
Normal file
|
|
@ -0,0 +1,40 @@
|
|||
Index: gyp/pylib/gyp/xcode_emulation.py
|
||||
===================================================================
|
||||
--- gyp/pylib/gyp/xcode_emulation.py
|
||||
+++ gyp/pylib/gyp/xcode_emulation.py
|
||||
@@ -483,9 +483,6 @@
|
||||
if self._Test('GCC_CHAR_IS_UNSIGNED_CHAR', 'YES', default='NO'):
|
||||
cflags.append('-funsigned-char')
|
||||
|
||||
- if self._Test('GCC_CW_ASM_SYNTAX', 'YES', default='YES'):
|
||||
- cflags.append('-fasm-blocks')
|
||||
-
|
||||
if 'GCC_DYNAMIC_NO_PIC' in self._Settings():
|
||||
if self._Settings()['GCC_DYNAMIC_NO_PIC'] == 'YES':
|
||||
cflags.append('-mdynamic-no-pic')
|
||||
@@ -495,9 +492,6 @@
|
||||
# mdynamic-no-pic by default for executable and possibly static lib
|
||||
# according to mento
|
||||
|
||||
- if self._Test('GCC_ENABLE_PASCAL_STRINGS', 'YES', default='YES'):
|
||||
- cflags.append('-mpascal-strings')
|
||||
-
|
||||
self._Appendf(cflags, 'GCC_OPTIMIZATION_LEVEL', '-O%s', default='s')
|
||||
|
||||
if self._Test('GCC_GENERATE_DEBUGGING_SYMBOLS', 'YES', default='YES'):
|
||||
@@ -553,7 +541,6 @@
|
||||
# TODO: Supporting fat binaries will be annoying.
|
||||
self._WarnUnimplemented('ARCHS')
|
||||
archs = ['i386']
|
||||
- cflags.append('-arch ' + archs[0])
|
||||
|
||||
if archs[0] in ('i386', 'x86_64'):
|
||||
if self._Test('GCC_ENABLE_SSE3_EXTENSIONS', 'YES', default='NO'):
|
||||
@@ -811,7 +798,6 @@
|
||||
# TODO: Supporting fat binaries will be annoying.
|
||||
self._WarnUnimplemented('ARCHS')
|
||||
archs = ['i386']
|
||||
- ldflags.append('-arch ' + archs[0])
|
||||
|
||||
# Xcode adds the product directory by default.
|
||||
ldflags.append('-L' + product_dir)
|
||||
25
pkgs/development/python-modules/gyp/no-xcode.patch
Normal file
25
pkgs/development/python-modules/gyp/no-xcode.patch
Normal file
|
|
@ -0,0 +1,25 @@
|
|||
--- gyp-old/pylib/gyp/xcode_emulation.py 1980-01-02 00:00:00.000000000 -0600
|
||||
+++ gyp/pylib/gyp/xcode_emulation.py 2020-08-02 20:24:24.871322520 -0500
|
||||
@@ -1407,10 +1407,10 @@
|
||||
raise GypError("xcodebuild returned unexpected results")
|
||||
except:
|
||||
version = CLTVersion()
|
||||
- if version:
|
||||
+ if version and re.match(r'(\d\.\d\.?\d*)', version):
|
||||
version = re.match(r'(\d\.\d\.?\d*)', version).groups()[0]
|
||||
else:
|
||||
- raise GypError("No Xcode or CLT version detected!")
|
||||
+ version = '7.0.0'
|
||||
# The CLT has no build information, so we return an empty string.
|
||||
version_list = [version, '']
|
||||
version = version_list[0]
|
||||
@@ -1667,7 +1667,8 @@
|
||||
sdk_root = xcode_settings._SdkRoot(configuration)
|
||||
if not sdk_root:
|
||||
sdk_root = xcode_settings._XcodeSdkPath('')
|
||||
- env['SDKROOT'] = sdk_root
|
||||
+ if not sdk_root:
|
||||
+ env['SDKROOT'] = ''
|
||||
|
||||
if not additional_settings:
|
||||
additional_settings = {}
|
||||
Loading…
Add table
Add a link
Reference in a new issue