public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

readline: Don't use gcc-apple

Browse Source
This commit is contained in:
Eelco Dolstra 2014-07-01 13:08:09 +02:00
parent 0fd9db3cfb
commit 06536251c9
3 changed files with 19 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pkgs/development/libraries/readline/no-arch_only.patch Normal file
View File

@ -0,0 +1,14 @@
diff -ru -x '*~' readline-6.2-orig/support/shobj-conf readline-6.2/support/shobj-conf
--- support/shobj-conf 2009-10-28 14:20:21.000000000 +0100
+++ support/shobj-conf 2014-07-01 13:03:28.000000000 +0200
@@ -168,8 +168,8 @@
SHLIB_LIBVERSION='$(SHLIB_MAJOR)$(SHLIB_MINOR).$(SHLIB_LIBSUFF)'
SHLIB_LIBSUFF='dylib'
- SHOBJ_LDFLAGS='-dynamiclib -dynamic -undefined dynamic_lookup -arch_only `/usr/bin/arch`'
- SHLIB_XLDFLAGS='-dynamiclib -arch_only `/usr/bin/arch` -install_name $(libdir)/$@ -current_version $(SHLIB_MAJOR)$(SHLIB_MINOR) -compatibility_version $(SHLIB_MAJOR) -v'
+ SHOBJ_LDFLAGS='-dynamiclib -dynamic -undefined dynamic_lookup'
+ SHLIB_XLDFLAGS='-dynamiclib -install_name $(libdir)/$@ -current_version $(SHLIB_MAJOR)$(SHLIB_MINOR) -compatibility_version $(SHLIB_MAJOR) -v'
SHLIB_LIBS='-lncurses' # see if -lcurses works on MacOS X 10.1
;;

4
pkgs/development/libraries/readline/readline6.nix
View File

@ -12,7 +12,9 @@ stdenv.mkDerivation (rec {
patchFlags = "-p0"; patchFlags = "-p0";
patches = patches =
[ ./link-against-ncurses.patch ] [ ./link-against-ncurses.patch
./no-arch_only.patch
]
++ ++
(let (let
patch = nr: sha256: patch = nr: sha256:

18
pkgs/top-level/all-packages.nix
View File

@ -5969,23 +5969,9 @@ let
readline5 = callPackage ../development/libraries/readline/readline5.nix { }; readline5 = callPackage ../development/libraries/readline/readline5.nix { };
readline6 = callPackage ../development/libraries/readline/readline6.nix { readline6 = callPackage ../development/libraries/readline/readline6.nix { };
stdenv =
# On Darwin, Readline uses `-arch_only', which is specific to
# Apple-GCC. So give it what it expects.
if stdenv.isDarwin
then overrideGCC stdenv gccApple
else stdenv;
};
readline63 = callPackage ../development/libraries/readline/readline6.3.nix { readline63 = callPackage ../development/libraries/readline/readline6.3.nix { };
stdenv =
# On Darwin, Readline uses `-arch_only', which is specific to
# Apple-GCC. So give it what it expects.
if stdenv.isDarwin
then overrideGCC stdenv gccApple
else stdenv;
};
librdf_raptor = callPackage ../development/libraries/librdf/raptor.nix { }; librdf_raptor = callPackage ../development/libraries/librdf/raptor.nix { };