Merge pull request #33575 from dtzWill/fix/cross-1

Minor cross fixes, 1
This commit is contained in:
John Ericson 2018-01-09 12:34:50 -05:00 committed by GitHub
commit 0c16a11c9a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 36 additions and 16 deletions

View file

@ -57,7 +57,7 @@ stdenv.mkDerivation rec {
''; '';
crossAttrs = let crossAttrs = let
inherit (hostPlatform) isDarwin isMingw; inherit (hostPlatform) isDarwin isMinGW;
in { in {
configurePhase = '' configurePhase = ''
makeFlagsArray=( makeFlagsArray=(
@ -65,10 +65,10 @@ stdenv.mkDerivation rec {
INSTALL_MAN=$out/share/man/man1 INSTALL_MAN=$out/share/man/man1
V=${luaversion} V=${luaversion}
R=${version} R=${version}
${if isMingw then "mingw" else stdenv.lib.optionalString isDarwin '' ${if isMinGW then "mingw" else stdenv.lib.optionalString isDarwin ''
''} ''}
) )
'' + stdenv.lib.optionalString isMingw '' '' + stdenv.lib.optionalString isMinGW ''
installFlagsArray=( installFlagsArray=(
TO_BIN="lua.exe luac.exe" TO_BIN="lua.exe luac.exe"
TO_LIB="liblua.a lua52.dll" TO_LIB="liblua.a lua52.dll"

View file

@ -56,7 +56,7 @@ stdenv.mkDerivation rec {
''; '';
crossAttrs = let crossAttrs = let
inherit (hostPlatform) isDarwin isMingw; inherit (hostPlatform) isDarwin isMinGW;
in { in {
configurePhase = '' configurePhase = ''
makeFlagsArray=( makeFlagsArray=(
@ -64,10 +64,10 @@ stdenv.mkDerivation rec {
INSTALL_MAN=$out/share/man/man1 INSTALL_MAN=$out/share/man/man1
V=${luaversion} V=${luaversion}
R=${version} R=${version}
${if isMingw then "mingw" else stdenv.lib.optionalString isDarwin '' ${if isMinGW then "mingw" else stdenv.lib.optionalString isDarwin ''
''} ''}
) )
'' + stdenv.lib.optionalString isMingw '' '' + stdenv.lib.optionalString isMinGW ''
installFlagsArray=( installFlagsArray=(
TO_BIN="lua.exe luac.exe" TO_BIN="lua.exe luac.exe"
TO_LIB="liblua.a lua52.dll" TO_LIB="liblua.a lua52.dll"

View file

@ -22,7 +22,12 @@ stdenv.mkDerivation rec {
outputs = [ "out" "dev" ]; outputs = [ "out" "dev" ];
configureFlags = [ "--with-tcl=no" "--localstatedir=/var/lib"] configureFlags = [ "--with-tcl=no" "--localstatedir=/var/lib"]
++ optional stdenv.isFreeBSD ''WARN_CFLAGS=""''; ++ optional stdenv.isFreeBSD ''WARN_CFLAGS=""''
++ optionals (stdenv.buildPlatform != stdenv.hostPlatform)
[ "krb5_cv_attr_constructor_destructor=yes,yes"
"ac_cv_func_regcomp=yes"
"ac_cv_printf_positional=yes"
];
nativeBuildInputs = [ pkgconfig perl ] nativeBuildInputs = [ pkgconfig perl ]
++ optional (!libOnly) yacc ++ optional (!libOnly) yacc

View file

@ -24,7 +24,15 @@ stdenv.mkDerivation rec {
buildInputs = optional (stdenv.isCygwin || stdenv.isDarwin || stdenv.isSunOS) libiconv; buildInputs = optional (stdenv.isCygwin || stdenv.isDarwin || stdenv.isSunOS) libiconv;
configureFlags = [ "--with-internal-glib" ] configureFlags = [ "--with-internal-glib" ]
++ optional (stdenv.isSunOS) [ "--with-libiconv=gnu" "--with-system-library-path" "--with-system-include-path" "CFLAGS=-DENABLE_NLS" ]; ++ optional (stdenv.isSunOS) [ "--with-libiconv=gnu" "--with-system-library-path" "--with-system-include-path" "CFLAGS=-DENABLE_NLS" ]
# Can't run these tests while cross-compiling
++ optional (stdenv.hostPlatform != stdenv.buildPlatform)
[ "glib_cv_stack_grows=no"
"glib_cv_uscore=no"
"ac_cv_func_posix_getpwuid_r=yes"
"ac_cv_func_posix_getgrgid_r=yes"
];
postInstall = ''rm -f "$out"/bin/*-pkg-config''; # clean the duplicate file postInstall = ''rm -f "$out"/bin/*-pkg-config''; # clean the duplicate file

View file

@ -13,8 +13,8 @@ stdenv.mkDerivation rec {
patches = [ ./include-systypes.patch ]; patches = [ ./include-systypes.patch ];
buildPhase = '' buildPhase = ''
cc -O3 -lbz2 bspatch.c -o bspatch $CC -O3 -lbz2 bspatch.c -o bspatch
cc -O3 -lbz2 bsdiff.c -o bsdiff $CC -O3 -lbz2 bsdiff.c -o bsdiff
''; '';
installPhase = '' installPhase = ''

View file

@ -1,4 +1,4 @@
{ fetchurl, stdenv, bison, flex, pam { stdenv, fetchurl, fetchpatch, bison, flex, pam
, sendmailPath ? "/run/wrappers/bin/sendmail" , sendmailPath ? "/run/wrappers/bin/sendmail"
, atWrapperPath ? "/run/wrappers/bin/at" , atWrapperPath ? "/run/wrappers/bin/at"
}: }:
@ -13,10 +13,17 @@ stdenv.mkDerivation rec {
sha256 = "1fgsrqpx0r6qcjxmlsqnwilydhfxn976c870mjc0n1bkmcy94w88"; sha256 = "1fgsrqpx0r6qcjxmlsqnwilydhfxn976c870mjc0n1bkmcy94w88";
}; };
patches = [ ./install.patch ]; patches = [
./install.patch
(fetchpatch {
url = "https://raw.githubusercontent.com/riscv/riscv-poky/master/meta/recipes-extended/at/at/0001-remove-glibc-assumption.patch";
sha256 = "1rk4hskp0c1jqkanzdxf873i6jgki3xhrm609fsam8an8sl1njnm";
})
];
buildInputs = nativeBuildInputs = [ bison flex ];
[ bison flex pam ];
buildInputs = [ pam ];
preConfigure = preConfigure =
'' ''

View file

@ -20,7 +20,7 @@
+ $(INSTALL) -m 755 -d $(IROOT)$(sbindir) + $(INSTALL) -m 755 -d $(IROOT)$(sbindir)
+ $(INSTALL) -m 755 -d $(IROOT)$(docdir) + $(INSTALL) -m 755 -d $(IROOT)$(docdir)
+ $(INSTALL) -m 755 -d $(IROOT)$(atdocdir) + $(INSTALL) -m 755 -d $(IROOT)$(atdocdir)
+ $(INSTALL) -m 0755 -s at $(IROOT)$(bindir) + $(INSTALL) -m 0755 at $(IROOT)$(bindir)
$(LN_S) -f at $(IROOT)$(bindir)/atq $(LN_S) -f at $(IROOT)$(bindir)/atq
$(LN_S) -f at $(IROOT)$(bindir)/atrm $(LN_S) -f at $(IROOT)$(bindir)/atrm
- $(INSTALL) -g root -o root -m 755 batch $(IROOT)$(bindir) - $(INSTALL) -g root -o root -m 755 batch $(IROOT)$(bindir)
@ -34,7 +34,7 @@
+ $(INSTALL) -d -m 755 $(IROOT)$(man1dir) + $(INSTALL) -d -m 755 $(IROOT)$(man1dir)
+ $(INSTALL) -d -m 755 $(IROOT)$(man5dir) + $(INSTALL) -d -m 755 $(IROOT)$(man5dir)
+ $(INSTALL) -d -m 755 $(IROOT)$(man8dir) + $(INSTALL) -d -m 755 $(IROOT)$(man8dir)
+ $(INSTALL) -m 755 -s atd $(IROOT)$(sbindir) + $(INSTALL) -m 755 atd $(IROOT)$(sbindir)
+ $(INSTALL) -m 755 atrun $(IROOT)$(sbindir) + $(INSTALL) -m 755 atrun $(IROOT)$(sbindir)
+ $(INSTALL) -m 644 at.1 $(IROOT)$(man1dir)/ + $(INSTALL) -m 644 at.1 $(IROOT)$(man1dir)/
cd $(IROOT)$(man1dir) && $(LN_S) -f at.1 atq.1 && $(LN_S) -f at.1 batch.1 && $(LN_S) -f at.1 atrm.1 cd $(IROOT)$(man1dir) && $(LN_S) -f at.1 atq.1 && $(LN_S) -f at.1 batch.1 && $(LN_S) -f at.1 atrm.1