FreeBSD patches for GNU m4, stdenv, miniupnpc
This commit is contained in:
parent
3cb831d2bc
commit
c01dbc4932
|
@ -10,7 +10,8 @@ stdenv.mkDerivation rec {
|
|||
|
||||
doCheck = !stdenv.isDarwin
|
||||
&& !stdenv.isCygwin # XXX: `test-dup2' fails on Cygwin
|
||||
&& !stdenv.isSunOS; # XXX: `test-setlocale2.sh' fails
|
||||
&& !stdenv.isSunOS # XXX: `test-setlocale2.sh' fails
|
||||
&& !stdenv.isFreeBSD; # XXX: test 084 fails
|
||||
|
||||
configureFlags = "--with-syscmd-shell=${stdenv.shell}";
|
||||
|
||||
|
|
|
@ -24,6 +24,100 @@ rec {
|
|||
alias make=gmake
|
||||
alias tar=gtar
|
||||
alias sed=gsed
|
||||
|
||||
alias patch=gpatch # pcre relied on this for patching binary files
|
||||
|
||||
# we need GNU cp for --reflink, need to alias all of coreutils
|
||||
alias basename=gbasename
|
||||
alias cat=gcat
|
||||
alias chgrp=gchgrp
|
||||
alias chmod=gchmod
|
||||
alias chown=gchown
|
||||
alias chroot=gchroot
|
||||
alias cksum=gcksum
|
||||
alias comm=gcomm
|
||||
alias cp=gcp
|
||||
alias csplit=gcsplit
|
||||
alias cut=gcut
|
||||
alias date=gdate
|
||||
alias dd=gdd
|
||||
alias df=gdf
|
||||
alias dir=gdir
|
||||
alias dircolors=gdircolors
|
||||
alias dirname=gdirname
|
||||
alias du=gdu
|
||||
alias echo=gecho
|
||||
alias env=genv
|
||||
alias expand=gexpand
|
||||
alias expr=gexpr
|
||||
alias factor=gfactor
|
||||
alias false=gfalse
|
||||
alias fmt=gfmt
|
||||
alias fold=gfold
|
||||
alias groups=ggroups
|
||||
alias head=ghead
|
||||
alias hostid=ghostid
|
||||
alias hostname=ghostname
|
||||
alias id=gid
|
||||
alias install=ginstall
|
||||
alias join=gjoin
|
||||
alias kill=gkill
|
||||
alias link=glink
|
||||
alias ln=gln
|
||||
alias logname=glogname
|
||||
alias ls=gls
|
||||
alias md5sum=gmd5sum
|
||||
alias mkdir=gmkdir
|
||||
alias mkfifo=gmkfifo
|
||||
alias mknod=gmknod
|
||||
alias mv=gmv
|
||||
alias nice=gnice
|
||||
alias nl=gnl
|
||||
alias nohup=gnohup
|
||||
alias od=god
|
||||
alias paste=gpaste
|
||||
alias pathchk=gpathchk
|
||||
alias pinky=gpinky
|
||||
alias pr=gpr
|
||||
alias printenv=gprintenv
|
||||
alias printf=gprintf
|
||||
alias ptx=gptx
|
||||
alias pwd=gpwd
|
||||
alias readlink=greadlink
|
||||
alias rm=grm
|
||||
alias rmdir=grmdir
|
||||
alias seq=gseq
|
||||
alias sha1sum=gsha1sum
|
||||
alias shred=gshred
|
||||
alias sleep=gsleep
|
||||
alias sort=gsort
|
||||
alias split=gsplit
|
||||
alias stat=gstat
|
||||
alias stty=gstty
|
||||
alias su=gsu
|
||||
alias sum=gsum
|
||||
alias sync=gsync
|
||||
alias tac=gtac
|
||||
#alias tail=gtail # this breaks xz XXX
|
||||
alias tee=gtee
|
||||
alias test=gtest
|
||||
alias touch=gtouch
|
||||
alias tr=gtr
|
||||
alias true=gtrue
|
||||
alias tsort=gtsort
|
||||
alias tty=gtty
|
||||
alias uname=guname
|
||||
alias unexpand=gunexpand
|
||||
alias uniq=guniq
|
||||
alias unlink=gunlink
|
||||
alias uptime=guptime
|
||||
alias users=gusers
|
||||
alias vdir=gvdir
|
||||
alias wc=gwc
|
||||
alias who=gwho
|
||||
alias whoami=gwhoami
|
||||
alias yes=gyes
|
||||
|
||||
export MAKE=gmake
|
||||
shopt -s expand_aliases
|
||||
'';
|
||||
|
|
|
@ -1,17 +1,18 @@
|
|||
{ stdenv, fetchFromGitHub }:
|
||||
{ stdenv, fetchurl }:
|
||||
|
||||
let version = "24d54ba13af4e53aba19c23898a373feecb41bd0"; in
|
||||
let version = "1.9.20150430"; in
|
||||
stdenv.mkDerivation rec {
|
||||
name = "miniupnpc-${version}";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "miniupnp";
|
||||
repo = "miniupnp";
|
||||
sha256 = "0j78dvlfh1a3a27zhvv001cb1d7vcgyv33bd1zr36drg64b6hrgw";
|
||||
rev = version;
|
||||
src = fetchurl {
|
||||
url = "http://miniupnp.free.fr/files/download.php?file=${name}.tar.gz";
|
||||
sha256 = "0ivnvzla0l2pzmy8s0j8ss0fnpsii7z9scvyl4a13g9k911hgmvn";
|
||||
name = "${name}.tar.gz";
|
||||
};
|
||||
|
||||
doCheck = true;
|
||||
patches = stdenv.lib.optional stdenv.isFreeBSD [ ./freebsd.patch ];
|
||||
|
||||
doCheck = !stdenv.isFreeBSD;
|
||||
|
||||
installFlags = "PREFIX=$(out) INSTALLPREFIX=$(out)";
|
||||
|
||||
|
|
11
pkgs/tools/networking/miniupnpc/freebsd.patch
Normal file
11
pkgs/tools/networking/miniupnpc/freebsd.patch
Normal file
|
@ -0,0 +1,11 @@
|
|||
diff --git a/minihttptestserver.c b/minihttptestserver.c
|
||||
index bbfdac3..a43999d 100644
|
||||
--- a/minihttptestserver.c
|
||||
+++ b/minihttptestserver.c
|
||||
@@ -1,3 +1,6 @@
|
||||
+#ifndef INADDR_LOOPBACK
|
||||
+#define INADDR_LOOPBACK 0x7f000001
|
||||
+#endif
|
||||
/* $Id: minihttptestserver.c,v 1.17 2015/02/06 10:31:19 nanard Exp $ */
|
||||
/* Project : miniUPnP
|
||||
* Author : Thomas Bernard
|
Loading…
Reference in a new issue