alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

added seperate meta-environment packages, use callpackage for aterm28

Browse source 
svn path=/nixpkgs/trunk/; revision=23394
This commit is contained in:
Rob Vermaas 2010-08-24 13:20:55 +00:00
parent 689b834242
commit 68a6fa773a
21 changed files with 1933 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
pkgs/development/libraries/asc-support/default.nix Normal file
View file

@ -0,0 +1,34 @@
{ stdenv
, fetchurl
, aterm
, toolbuslib
, asfSupport
, errorSupport
, ptSupport
, sglr
, tideSupport
, cLibrary
, configSupport
, ptableSupport
, rstoreSupport
, pkgconfig
}:
let
isMingw = stdenv ? cross && stdenv.cross.config == "i686-pc-mingw32" ;
in
stdenv.mkDerivation rec {
name = "asc-support-2.6";
src = fetchurl {
url = "http://www.meta-environment.org/releases/${name}.tar.gz";
sha256 = "1svq368kdxnmjdfv8sqs0cn9s69c75qcp44mpapfjj6kfhrzkxdc";
};
patches = if isMingw then [./mingw.patch] else [];
buildInputs = [aterm toolbuslib asfSupport errorSupport ptSupport sglr tideSupport cLibrary configSupport ptableSupport rstoreSupport ];
buildNativeInputs = [pkgconfig];
dontStrip = isMingw;
}

48
pkgs/development/libraries/asc-support/mingw.patch Normal file
View file

@ -0,0 +1,48 @@
diff -rc asc-support-2.6/lib/asc-main.c asc-support-2.6-new/lib/asc-main.c
*** asc-support-2.6/lib/asc-main.c 2008-11-10 14:12:47.000000000 +0100
--- asc-support-2.6-new/lib/asc-main.c 2010-08-24 11:02:04.000000000 +0200
***************
*** 7,13 ****
#include <ctype.h>
#include <string.h>
#include <sys/time.h>
- #include <sys/resource.h>
#include <unistd.h>
#include <aterm2.h>
#include <sglrInterface.h>
--- 7,12 ----
***************
*** 46,52 ****
}
static void printStats() {
- struct rusage usage;
FILE *file;
char buf[BUFSIZ];
int size, resident, shared, trs, lrs, drs, dt;
--- 45,50 ----
***************
*** 61,74 ****
fprintf(stderr, "could not open %s\n", buf);
perror("");
}
! if (getrusage(RUSAGE_SELF, &usage) == -1) {
! perror("rusage");
! } else {
! fprintf(stderr, "utime : %ld.%06d sec.\n",
! (long)usage.ru_utime.tv_sec, (int)usage.ru_utime.tv_usec);
! fprintf(stderr, "stime : %ld.%06d sec.\n",
! (long)usage.ru_stime.tv_sec, (int)usage.ru_stime.tv_usec);
! }
}
static ATbool toolbusMode(int argc, char* argv[]) {
--- 59,66 ----
fprintf(stderr, "could not open %s\n", buf);
perror("");
}
! fprintf(stderr, "utime : %ld.%06d sec.\n", 0, 0);
! fprintf(stderr, "stime : %ld.%06d sec.\n", 0, 0);
}
static ATbool toolbusMode(int argc, char* argv[]) {

24
pkgs/development/libraries/asf-support/default.nix Normal file
View file

@ -0,0 +1,24 @@
{ stdenv
, fetchurl
, aterm
, errorSupport
, ptSupport
, pkgconfig
}:
let
isMingw = stdenv ? cross && stdenv.cross.config == "i686-pc-mingw32" ;
in
stdenv.mkDerivation rec {
name = "asf-support-1.8";
src = fetchurl {
url = "http://www.meta-environment.org/releases/${name}.tar.gz";
sha256 = "04f7grfadq0si24rs9vlcknlahfa7nb3d6n6pjl1qbxi8m1gwhnc";
};
buildInputs = [aterm errorSupport ptSupport];
buildNativeInputs = [pkgconfig];
dontStrip = isMingw;
}

9
pkgs/development/libraries/aterm/2.8.nix
View file

@ -1,6 +1,9 @@
{stdenv, fetchurl}:
stdenv.mkDerivation {
let
isMingw = stdenv ? cross && stdenv.cross.config == "i686-pc-mingw32" ;
in
stdenv.mkDerivation ( {
name = "aterm-2.8";
src = fetchurl {
@ -11,7 +14,7 @@ stdenv.mkDerivation {
patches = [
# Fix for http://bugzilla.sen.cwi.nl:8080/show_bug.cgi?id=841
./max-long.patch
];
] ++ ( if isMingw then [./aterm-mingw-asm.patch] else [] );
doCheck = true;
@ -20,4 +23,4 @@ stdenv.mkDerivation {
license = "LGPL";
description = "Library for manipulation of term data structures in C";
};
}
} // ( if isMingw then { dontStrip = true; } else {}) )

498
pkgs/development/libraries/aterm/aterm-mingw-asm.patch Normal file
View file

@ -0,0 +1,498 @@
diff -rc aterm-2.8/aterm/gc.c aterm-2.8-new/aterm/gc.c
*** aterm-2.8/aterm/gc.c 2008-11-10 13:54:22.000000000 +0100
--- aterm-2.8-new/aterm/gc.c 2010-08-23 17:04:56.000000000 +0200
***************
*** 260,317 ****
AFun oddSym;
#endif
- #ifdef WIN32
-
- unsigned int r_eax, r_ebx, r_ecx, r_edx, \
- r_esi, r_edi, r_esp, r_ebp;
- ATerm reg[8], real_term;
-
- __asm {
- /* Get the registers into local variables to check them
- for aterms later. */
- mov r_eax, eax
- mov r_ebx, ebx
- mov r_ecx, ecx
- mov r_edx, edx
- mov r_esi, esi
- mov r_edi, edi
- mov r_esp, esp
- mov r_ebp, ebp
- }
- /* Put the register-values into an array */
- reg[0] = (ATerm) r_eax;
- reg[1] = (ATerm) r_ebx;
- reg[2] = (ATerm) r_ecx;
- reg[3] = (ATerm) r_edx;
- reg[4] = (ATerm) r_esi;
- reg[5] = (ATerm) r_edi;
- reg[6] = (ATerm) r_esp;
- reg[7] = (ATerm) r_ebp;
-
- for(i=0; i<8; i++) {
- real_term = AT_isInsideValidTerm(reg[i]);
- if (real_term != NULL) {
- AT_markTerm(real_term);
- }
- if (AT_isValidSymbol((Symbol)reg[i])) {
- AT_markSymbol((Symbol)reg[i]);
- }
- }
-
- /* The register variables are on the stack aswell
- I set them to zero so they won't be processed again when
- the stack is traversed. The reg-array is also in the stack
- but that will be adjusted later */
- r_eax = 0;
- r_ebx = 0;
- r_ecx = 0;
- r_edx = 0;
- r_esi = 0;
- r_edi = 0;
- r_esp = 0;
- r_ebp = 0;
-
- #else
jmp_buf env;
/* Traverse possible register variables */
--- 260,265 ----
***************
*** 320,326 ****
start = (ATerm *)((char *)env);
stop = ((ATerm *)(((char *)env) + sizeof(jmp_buf)));
mark_memory(start, stop);
- #endif
stackTop = stack_top();
--- 268,273 ----
***************
*** 385,442 ****
AFun oddSym;
#endif
- #ifdef WIN32
-
- unsigned int r_eax, r_ebx, r_ecx, r_edx, \
- r_esi, r_edi, r_esp, r_ebp;
- ATerm reg[8], real_term;
-
- __asm {
- /* Get the registers into local variables to check them
- for aterms later. */
- mov r_eax, eax
- mov r_ebx, ebx
- mov r_ecx, ecx
- mov r_edx, edx
- mov r_esi, esi
- mov r_edi, edi
- mov r_esp, esp
- mov r_ebp, ebp
- }
- /* Put the register-values into an array */
- reg[0] = (ATerm) r_eax;
- reg[1] = (ATerm) r_ebx;
- reg[2] = (ATerm) r_ecx;
- reg[3] = (ATerm) r_edx;
- reg[4] = (ATerm) r_esi;
- reg[5] = (ATerm) r_edi;
- reg[6] = (ATerm) r_esp;
- reg[7] = (ATerm) r_ebp;
-
- for(i=0; i<8; i++) {
- real_term = AT_isInsideValidTerm(reg[i]);
- if (real_term != NULL) {
- AT_markTerm_young(real_term);
- }
- if (AT_isValidSymbol((Symbol)reg[i])) {
- AT_markSymbol_young((Symbol)reg[i]);
- }
- }
-
- /* The register variables are on the stack aswell
- I set them to zero so they won't be processed again when
- the stack is traversed. The reg-array is also in the stack
- but that will be adjusted later */
- r_eax = 0;
- r_ebx = 0;
- r_ecx = 0;
- r_edx = 0;
- r_esi = 0;
- r_edi = 0;
- r_esp = 0;
- r_ebp = 0;
-
- #else
jmp_buf env;
/* Traverse possible register variables */
--- 332,337 ----
***************
*** 445,451 ****
start = (ATerm *)((char *)env);
stop = ((ATerm *)(((char *)env) + sizeof(jmp_buf)));
mark_memory_young(start, stop);
- #endif
stackTop = stack_top();
start = MIN(stackTop, stackBot);
--- 340,345 ----
Only in aterm-2.8-new/aterm: gc.c.orig
diff -rc aterm-2.8/configure aterm-2.8-new/configure
*** aterm-2.8/configure 2008-11-10 13:54:27.000000000 +0100
--- aterm-2.8-new/configure 2010-08-23 17:08:10.000000000 +0200
***************
*** 19970,20295 ****
CURDATE=`date`
- echo "$as_me:$LINENO: checking whether byte ordering is bigendian" >&5
- echo $ECHO_N "checking whether byte ordering is bigendian... $ECHO_C" >&6
- if test "${ac_cv_c_bigendian+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- # See if sys/param.h defines the BYTE_ORDER macro.
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- #include <sys/types.h>
- #include <sys/param.h>
-
- int
- main ()
- {
- #if !BYTE_ORDER || !BIG_ENDIAN || !LITTLE_ENDIAN
- bogus endian macros
- #endif
-
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- # It does; now see whether it defined to BIG_ENDIAN or not.
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- #include <sys/types.h>
- #include <sys/param.h>
-
- int
- main ()
- {
- #if BYTE_ORDER != BIG_ENDIAN
- not big endian
- #endif
-
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- ac_cv_c_bigendian=yes
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_c_bigendian=no
- fi
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
- # It does not; compile a test program.
- if test "$cross_compiling" = yes; then
- # try to guess the endianness by grepping values into an object file
- ac_cv_c_bigendian=unknown
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- short ascii_mm[] = { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 };
- short ascii_ii[] = { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 };
- void _ascii () { char *s = (char *) ascii_mm; s = (char *) ascii_ii; }
- short ebcdic_ii[] = { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 };
- short ebcdic_mm[] = { 0xC2C9, 0xC785, 0x95C4, 0x8981, 0x95E2, 0xA8E2, 0 };
- void _ebcdic () { char *s = (char *) ebcdic_mm; s = (char *) ebcdic_ii; }
- int
- main ()
- {
- _ascii (); _ebcdic ();
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- if grep BIGenDianSyS conftest.$ac_objext >/dev/null ; then
- ac_cv_c_bigendian=yes
- fi
- if grep LiTTleEnDian conftest.$ac_objext >/dev/null ; then
- if test "$ac_cv_c_bigendian" = unknown; then
- ac_cv_c_bigendian=no
- else
- # finding both strings is unlikely to happen, but who knows?
- ac_cv_c_bigendian=unknown
- fi
- fi
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
- fi
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- else
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- int
- main ()
- {
- /* Are we little or big endian? From Harbison&Steele. */
- union
- {
- long l;
- char c[sizeof (long)];
- } u;
- u.l = 1;
- exit (u.c[sizeof (long) - 1] == 1);
- }
- _ACEOF
- rm -f conftest$ac_exeext
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- ac_cv_c_bigendian=no
- else
- echo "$as_me: program exited with status $ac_status" >&5
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
- ( exit $ac_status )
- ac_cv_c_bigendian=yes
- fi
- rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
- fi
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
- echo "$as_me:$LINENO: result: $ac_cv_c_bigendian" >&5
- echo "${ECHO_T}$ac_cv_c_bigendian" >&6
- case $ac_cv_c_bigendian in
- yes)
-
- cat >>confdefs.h <<\_ACEOF
- #define WORDS_BIGENDIAN 1
- _ACEOF
- ;;
- no)
- ;;
- *)
- { { echo "$as_me:$LINENO: error: unknown endianness
- presetting ac_cv_c_bigendian=no (or yes) will help" >&5
- echo "$as_me: error: unknown endianness
- presetting ac_cv_c_bigendian=no (or yes) will help" >&2;}
- { (exit 1); exit 1; }; } ;;
- esac
-
-
- echo "$as_me:$LINENO: checking whether float word ordering is big endian" >&5
- echo $ECHO_N "checking whether float word ordering is big endian... $ECHO_C" >&6
- if test "${ax_cv_c_float_word_order_big+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-
- if test "$cross_compiling" = yes; then
- { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
- See \`config.log' for more details." >&5
- echo "$as_me: error: cannot run test program while cross compiling
- See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; }
- else
- cat >conftest.$ac_ext <<_ACEOF
-
- /* This code returns 0 if the float word order is big endian and >= 1 if it is little endian. */
- main(){
- #ifdef WORDS_BIGENDIAN
- return 0; /* If the system's encoding is big endian, so is the float word order. NOTE: If the encoding is big endian and WORDS_BIGENDIAN isn't defined, the code below will still return the correct float word order (big). */
- #else
- union
- {
- double d;
- /* IEEE754 little endian encoded floating point number structure with little endian float word order. */
- struct{
- unsigned int mantissa1:32;
- unsigned int mantissa0:20;
- unsigned int exponent:11;
- unsigned int negative:1;
- } ieee;
- } u;
- u.d = -1;
- return (u.ieee.negative == 1);
- #endif
- }
-
- _ACEOF
- rm -f conftest$ac_exeext
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- ax_cv_c_float_word_order_big=yes
- else
- echo "$as_me: program exited with status $ac_status" >&5
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
- ( exit $ac_status )
- ax_cv_c_float_word_order_big=no
- fi
- rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
-
-
- fi
- echo "$as_me:$LINENO: result: $ax_cv_c_float_word_order_big" >&5
- echo "${ECHO_T}$ax_cv_c_float_word_order_big" >&6
-
- case $ax_cv_c_float_word_order_big in
- yes)
-
-
- cat >>confdefs.h <<\_ACEOF
- #define FLOAT_WORD_ORDER_BIG 1
- _ACEOF
-
-
- ;;
- no)
- ;;
- *)
-
- { { echo "$as_me:$LINENO: error: Unable to determain float word ordering. You need to manually preset ax_cv_c_float_word_order_big=(yes / no).
- " >&5
- echo "$as_me: error: Unable to determain float word ordering. You need to manually preset ax_cv_c_float_word_order_big=(yes / no).
- " >&2;}
- { (exit 1); exit 1; }; }
-
- ;;
- esac
-
-
for ac_func in strdup
--- 19970,19975 ----
diff -rc aterm-2.8/Makefile.in aterm-2.8-new/Makefile.in
*** aterm-2.8/Makefile.in 2008-11-10 13:54:28.000000000 +0100
--- aterm-2.8-new/Makefile.in 2010-08-23 17:05:27.000000000 +0200
***************
*** 217,223 ****
pkgconfig_DATA = ${PACKAGE}.pc
! SUBDIRS = aterm utils test
ACLOCAL_AMFLAGS = -I .
subdir = .
--- 217,223 ----
pkgconfig_DATA = ${PACKAGE}.pc
! SUBDIRS = aterm utils
ACLOCAL_AMFLAGS = -I .
subdir = .

22
pkgs/development/libraries/c-library/default.nix Normal file
View file

@ -0,0 +1,22 @@
{ stdenv
, fetchurl
, aterm
, pkgconfig
}:
let
isMingw = stdenv ? cross && stdenv.cross.config == "i686-pc-mingw32" ;
in
stdenv.mkDerivation rec {
name = "c-library-1.2";
src = fetchurl {
url = "http://www.meta-environment.org/releases/${name}.tar.gz";
sha256 = "0rmhag2653nq76n1n49blii9zx0ph58szv1xzw1i551wmw7yrz88";
};
patches = if isMingw then [./mingw.patch] else [];
buildInputs = [aterm];
buildNativeInputs = [pkgconfig];
dontStrip = isMingw;
}

114
pkgs/development/libraries/c-library/mingw.patch Normal file
View file

@ -0,0 +1,114 @@
diff -rc c-library-1.2/statistics/rsrc-usage.c c-library-1.2-new/statistics/rsrc-usage.c
*** c-library-1.2/statistics/rsrc-usage.c 2008-11-10 14:09:47.000000000 +0100
--- c-library-1.2-new/statistics/rsrc-usage.c 2010-08-24 09:09:13.000000000 +0200
***************
*** 2,81 ****
#include <unistd.h>
#include <stdio.h>
- #include <sys/time.h>
- #include <sys/resource.h>
#include "rsrc-usage.h"
/*static int AT_calcAllocatedSize();*/
- static struct rusage rsrc_usage;
- static struct rusage flt_rsrc_usage;
void printrusage(struct rusage *rusage) {
- fprintf(stderr, "maxrss %ld\n", rusage->ru_maxrss);
- fprintf(stderr, "ixrss %ld\n", rusage->ru_ixrss);
- fprintf(stderr, "idrss %ld\n", rusage->ru_idrss);
- fprintf(stderr, "isrss %ld\n", rusage->ru_isrss);
- fprintf(stderr, "minflt %ld\n", rusage->ru_minflt);
- fprintf(stderr, "majflt %ld\n", rusage->ru_majflt);
- fprintf(stderr, "nswap %ld\n", rusage->ru_nswap);
- fprintf(stderr, "inblock %ld\n", rusage->ru_inblock);
- fprintf(stderr, "oublock %ld\n", rusage->ru_oublock);
- fprintf(stderr, "msgsnd %ld\n", rusage->ru_msgsnd);
- fprintf(stderr, "msgrcv %ld\n", rusage->ru_msgrcv);
- fprintf(stderr, "nsignals %ld\n", rusage->ru_nsignals);
- fprintf(stderr, "nvcsw %ld\n", rusage->ru_nvcsw);
- fprintf(stderr, "nivcsw %ld\n", rusage->ru_nivcsw);
}
double STATS_Timer(void) {
! static double cur = 0;
! double prev;
!
! prev = cur;
! if (getrusage(RUSAGE_SELF, &rsrc_usage) == -1) {
! perror("getrusage");
! return (double)0;
! }
!
! cur = (double) (rsrc_usage.ru_utime.tv_sec) +
! (double) ((rsrc_usage.ru_utime.tv_usec) * 1.0e-06);
!
! prev = cur - prev;
! return prev > 0 ? prev: 0;
}
void STATS_PageFlt(long *maj, long *min) {
! static long ma, mi, ma_prev, mi_prev;
!
!
! ma_prev = ma;
! mi_prev = mi;
! getrusage(RUSAGE_SELF, &flt_rsrc_usage);
!
! /* printrusage(&flt_rsrc_usage); */
!
! mi = flt_rsrc_usage.ru_minflt - mi_prev;
! ma = flt_rsrc_usage.ru_majflt - ma_prev;
!
! *maj = ma;
! *min = mi;
}
long STATS_Allocated(void) {
! static long allocated = 0L;
! long tmp;
!
! tmp = allocated;
! /** \todo: AT_calcAllocatedSize() is unreachable. Fix. */
! /*allocated = AT_calcAllocatedSize();*/
!
! return allocated - tmp;
}
long STATS_ResidentSetSize(void) {
! getrusage(RUSAGE_SELF, &rsrc_usage);
!
! return rsrc_usage.ru_maxrss;
}
--- 2,29 ----
#include <unistd.h>
#include <stdio.h>
#include "rsrc-usage.h"
/*static int AT_calcAllocatedSize();*/
void printrusage(struct rusage *rusage) {
}
double STATS_Timer(void) {
! return 0;
}
void STATS_PageFlt(long *maj, long *min) {
! *maj = 0;
! *min = 0;
}
long STATS_Allocated(void) {
! return 0;
}
long STATS_ResidentSetSize(void) {
! return 0;
}

22
pkgs/development/libraries/config-support/default.nix Normal file
View file

@ -0,0 +1,22 @@
{ stdenv
, fetchurl
, aterm
, pkgconfig
}:
let
isMingw = stdenv ? cross && stdenv.cross.config == "i686-pc-mingw32" ;
in
stdenv.mkDerivation rec {
name = "config-support-1.4";
src = fetchurl {
url = "http://www.meta-environment.org/releases/${name}.tar.gz";
sha256 = "0klhc7v760aklsy73pwn87snhgalkfxisac8srn8qcd3ljbfdrmi";
};
buildInputs = [aterm];
buildNativeInputs = [pkgconfig];
dontStrip = isMingw;
}

22
pkgs/development/libraries/error-support/default.nix Normal file
View file

@ -0,0 +1,22 @@
{ stdenv
, fetchurl
, aterm
, toolbuslib
, pkgconfig
}:
let
isMingw = stdenv ? cross && stdenv.cross.config == "i686-pc-mingw32" ;
in
stdenv.mkDerivation rec {
name = "error-support-1.6";
src = fetchurl {
url = "http://www.meta-environment.org/releases/${name}.tar.gz";
sha256 = "0sdw3mrh90k76w2pvpdfg7d2cxfxb3s5spbqglkkpvx8bldhlk33";
};
buildInputs = [aterm toolbuslib];
buildNativeInputs = [pkgconfig];
dontStrip = isMingw;
}

33
pkgs/development/libraries/pgen/default.nix Normal file
View file

@ -0,0 +1,33 @@
{ stdenv
, fetchurl
, aterm
, toolbuslib
, cLibrary
, configSupport
, ptSupport
, ptableSupport
, errorSupport
, tideSupport
, ascSupport
, asfSupport
, sdfSupport
, sglr
, pkgconfig
}:
let
isMingw = stdenv ? cross && stdenv.cross.config == "i686-pc-mingw32" ;
in
stdenv.mkDerivation ( rec {
name = "pgen-2.8.1";
src = fetchurl {
url = "http://www.meta-environment.org/releases/${name}.tar.gz";
sha256 = "0z5x6rnsp732jdszcgm22bfw3v6ai9zl49b3s5iyk9qjfmyx0h41";
};
buildInputs = [aterm toolbuslib cLibrary configSupport ptSupport ptableSupport errorSupport tideSupport sdfSupport sglr ascSupport asfSupport];
buildNativeInputs = [pkgconfig];
dontStrip = isMingw;
} // ( if isMingw then { NIX_CFLAGS_COMPILE = "-O2 -Wl,--stack=0x2300000"; } else {} ) )

24
pkgs/development/libraries/pt-support/default.nix Normal file
View file

@ -0,0 +1,24 @@
{ stdenv
, fetchurl
, aterm
, toolbuslib
, errorSupport
, pkgconfig
}:
let
isMingw = stdenv ? cross && stdenv.cross.config == "i686-pc-mingw32" ;
in
stdenv.mkDerivation ( rec {
name = "pt-support-2.4";
src = fetchurl {
url = "http://www.meta-environment.org/releases/${name}.tar.gz";
sha256 = "14krhhhmrg7605ppglzd1k08n7x61g7vdkh11qcz8hb9r4n71j45";
};
buildInputs = [aterm toolbuslib errorSupport];
buildNativeInputs = [pkgconfig];
dontStrip = isMingw;
} // ( if isMingw then { NIX_CFLAGS_COMPILE = "-O2 -Wl,--stack=0x2300000"; } else {} ) )

22
pkgs/development/libraries/ptable-support/default.nix Normal file
View file

@ -0,0 +1,22 @@
{ stdenv
, fetchurl
, aterm
, ptSupport
, pkgconfig
}:
let
isMingw = stdenv ? cross && stdenv.cross.config == "i686-pc-mingw32" ;
in
stdenv.mkDerivation rec {
name = "ptable-support-1.2";
src = fetchurl {
url = "http://www.meta-environment.org/releases/${name}.tar.gz";
sha256 = "0bqx1xsimf9vq6q2qnsy3565rzlha4cm2blcn3kqwbirfyj1kln9";
};
buildInputs = [aterm ptSupport];
buildNativeInputs = [pkgconfig];
dontStrip = isMingw;
}

23
pkgs/development/libraries/rstore-support/default.nix Normal file
View file

@ -0,0 +1,23 @@
{ stdenv
, fetchurl
, aterm
, toolbuslib
, pkgconfig
}:
let
isMingw = stdenv ? cross && stdenv.cross.config == "i686-pc-mingw32" ;
in
stdenv.mkDerivation rec {
name = "rstore-support-1.0";
src = fetchurl {
url = "http://www.meta-environment.org/releases/${name}.tar.gz";
sha256 = "0fahq947bdaiymfz08fb2kvbnggpc8ybhh3sbxgja61pp2jizg46";
};
buildInputs = [aterm toolbuslib];
buildNativeInputs = [pkgconfig];
dontStrip = isMingw;
}

14
pkgs/development/libraries/sdf-library/default.nix Normal file
View file

@ -0,0 +1,14 @@
{ stdenv
, fetchurl
, aterm
}:
stdenv.mkDerivation {
name = "sdf-library-1.1";
src = fetchurl {
url = http://www.meta-environment.org/releases/sdf-library-1.1.tar.gz;
sha256 = "0dnv2f690s4q60bssavivganyalh7n966grcsb5hlb6z57gbaqp1";
};
buildInputs = [aterm];
}

27
pkgs/development/libraries/sdf-support/default.nix Normal file
View file

@ -0,0 +1,27 @@
{ stdenv
, fetchurl
, aterm
, toolbuslib
, errorSupport
, ptSupport
, pkgconfig
}:
let
isMingw = stdenv ? cross && stdenv.cross.config == "i686-pc-mingw32" ;
in
stdenv.mkDerivation rec {
name = "sdf-support-2.5";
src = fetchurl {
url = "http://www.meta-environment.org/releases/${name}.tar.gz";
sha256 = "0zazks2yvm8gqdx0389b1b8hf8ss284q1ywk4d7cqc8glba29cs0";
};
patches = if isMingw then [./mingw.patch] else [];
buildInputs = [aterm toolbuslib errorSupport ptSupport];
buildNativeInputs = [pkgconfig];
dontStrip = isMingw;
}

20
pkgs/development/libraries/sdf-support/mingw.patch Normal file
View file

@ -0,0 +1,20 @@
diff -rc sdf-support-2.5/utils/sdf-modules/src/main.c sdf-support-2.5-new/utils/sdf-modules/src/main.c
*** sdf-support-2.5/utils/sdf-modules/src/main.c 2008-11-10 14:20:07.000000000 +0100
--- sdf-support-2.5-new/utils/sdf-modules/src/main.c 2010-08-24 10:53:04.000000000 +0200
***************
*** 19,25 ****
/*{{{ defines */
#define SEP '/'
! #define PATH_LEN (_POSIX_PATH_MAX)
/*}}} */
/*{{{ variables */
--- 19,25 ----
/*{{{ defines */
#define SEP '/'
! #define PATH_LEN (256)
/*}}} */
/*{{{ variables */

28
pkgs/development/libraries/sglr/default.nix Normal file
View file

@ -0,0 +1,28 @@
{ stdenv
, fetchurl
, aterm
, toolbuslib
, cLibrary
, configSupport
, ptSupport
, ptableSupport
, errorSupport
, pkgconfig
}:
let
isMingw = stdenv ? cross && stdenv.cross.config == "i686-pc-mingw32" ;
in
stdenv.mkDerivation rec {
name = "sglr-4.5.3";
src = fetchurl {
url = "http://www.meta-environment.org/releases/${name}.tar.gz";
sha256 = "1k3q9k32r6i2wh3k6b000fs11n0vhy6yr8kr0bd58ybwp5dnjj77";
};
buildInputs = [aterm toolbuslib cLibrary configSupport ptSupport ptableSupport errorSupport];
buildNativeInputs = [pkgconfig];
dontStrip = isMingw;
}

23
pkgs/development/libraries/tide-support/default.nix Normal file
View file

@ -0,0 +1,23 @@
{ stdenv
, fetchurl
, aterm
, toolbuslib
, pkgconfig
}:
let
isMingw = stdenv ? cross && stdenv.cross.config == "i686-pc-mingw32" ;
in
stdenv.mkDerivation rec {
name = "tide-support-1.3.1";
src = fetchurl {
url = "http://www.meta-environment.org/releases/${name}.tar.gz";
sha256 = "06n80rihcj2dhrvx8969jbgxqvg2vb3jqpkdmcr47y08xs7j5n2b";
};
buildInputs = [aterm toolbuslib];
buildNativeInputs = [pkgconfig];
dontStrip = isMingw;
}

33
pkgs/development/libraries/toolbuslib/default.nix
View file

@ -1,11 +1,24 @@
{stdenv, fetchurl, aterm} :
{ stdenv
, fetchurl
, aterm
, pkgconfig
, w32api
}:
let
isMingw = stdenv ? cross && stdenv.cross.config == "i686-pc-mingw32" ;
in
stdenv.mkDerivation rec {
name = "toolbuslib-1.1";
stdenv.mkDerivation {
name = "toolbuslib-0.7.2";
src = fetchurl {
url = http://www.cwi.nl/projects/MetaEnv/toolbuslib/toolbuslib-0.7.2.tar.gz;
md5 = "6619a155c6326d728d53c6901558e350";
};
inherit aterm;
buildinputs = [aterm];
}
src = fetchurl {
url = "http://www.meta-environment.org/releases/${name}.tar.gz";
sha256 = "0f4q0r177lih23ypypc8ckkyv5vhvnkhbrv25gswrqdif5dxbwr0";
};
patches = if isMingw then [./mingw.patch] else [];
buildInputs = [aterm] ++ (if isMingw then [w32api] else []);
buildNativeInputs = [pkgconfig];
dontStrip = isMingw;
}

888
pkgs/development/libraries/toolbuslib/mingw.patch Normal file
View file

@ -0,0 +1,888 @@
diff -rc toolbuslib-1.1/configure toolbuslib-1.1-new/configure
*** toolbuslib-1.1/configure 2008-11-10 13:59:46.000000000 +0100
--- toolbuslib-1.1-new/configure 2010-08-23 16:53:39.000000000 +0200
***************
*** 20719,21162 ****
fi
- if test "${ac_cv_header_netdb_h+set}" = set; then
- echo "$as_me:$LINENO: checking for netdb.h" >&5
- echo $ECHO_N "checking for netdb.h... $ECHO_C" >&6
- if test "${ac_cv_header_netdb_h+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- fi
- echo "$as_me:$LINENO: result: $ac_cv_header_netdb_h" >&5
- echo "${ECHO_T}$ac_cv_header_netdb_h" >&6
- else
- # Is the header compilable?
- echo "$as_me:$LINENO: checking netdb.h usability" >&5
- echo $ECHO_N "checking netdb.h usability... $ECHO_C" >&6
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
- #include <netdb.h>
- _ACEOF
- rm -f conftest.$ac_objext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- ac_header_compiler=yes
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_header_compiler=no
- fi
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
- echo "${ECHO_T}$ac_header_compiler" >&6
-
- # Is the header present?
- echo "$as_me:$LINENO: checking netdb.h presence" >&5
- echo $ECHO_N "checking netdb.h presence... $ECHO_C" >&6
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- #include <netdb.h>
- _ACEOF
- if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null; then
- if test -s conftest.err; then
- ac_cpp_err=$ac_c_preproc_warn_flag
- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
- else
- ac_cpp_err=
- fi
- else
- ac_cpp_err=yes
- fi
- if test -z "$ac_cpp_err"; then
- ac_header_preproc=yes
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_header_preproc=no
- fi
- rm -f conftest.err conftest.$ac_ext
- echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
- echo "${ECHO_T}$ac_header_preproc" >&6
-
- # So? What about this header?
- case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
- yes:no: )
- { echo "$as_me:$LINENO: WARNING: netdb.h: accepted by the compiler, rejected by the preprocessor!" >&5
- echo "$as_me: WARNING: netdb.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
- { echo "$as_me:$LINENO: WARNING: netdb.h: proceeding with the compiler's result" >&5
- echo "$as_me: WARNING: netdb.h: proceeding with the compiler's result" >&2;}
- ac_header_preproc=yes
- ;;
- no:yes:* )
- { echo "$as_me:$LINENO: WARNING: netdb.h: present but cannot be compiled" >&5
- echo "$as_me: WARNING: netdb.h: present but cannot be compiled" >&2;}
- { echo "$as_me:$LINENO: WARNING: netdb.h: check for missing prerequisite headers?" >&5
- echo "$as_me: WARNING: netdb.h: check for missing prerequisite headers?" >&2;}
- { echo "$as_me:$LINENO: WARNING: netdb.h: see the Autoconf documentation" >&5
- echo "$as_me: WARNING: netdb.h: see the Autoconf documentation" >&2;}
- { echo "$as_me:$LINENO: WARNING: netdb.h: section \"Present But Cannot Be Compiled\"" >&5
- echo "$as_me: WARNING: netdb.h: section \"Present But Cannot Be Compiled\"" >&2;}
- { echo "$as_me:$LINENO: WARNING: netdb.h: proceeding with the preprocessor's result" >&5
- echo "$as_me: WARNING: netdb.h: proceeding with the preprocessor's result" >&2;}
- { echo "$as_me:$LINENO: WARNING: netdb.h: in the future, the compiler will take precedence" >&5
- echo "$as_me: WARNING: netdb.h: in the future, the compiler will take precedence" >&2;}
- (
- cat <<\_ASBOX
- ## ------------------------------------------ ##
- ## Report this to the AC_PACKAGE_NAME lists. ##
- ## ------------------------------------------ ##
- _ASBOX
- ) |
- sed "s/^/$as_me: WARNING: /" >&2
- ;;
- esac
- echo "$as_me:$LINENO: checking for netdb.h" >&5
- echo $ECHO_N "checking for netdb.h... $ECHO_C" >&6
- if test "${ac_cv_header_netdb_h+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- ac_cv_header_netdb_h=$ac_header_preproc
- fi
- echo "$as_me:$LINENO: result: $ac_cv_header_netdb_h" >&5
- echo "${ECHO_T}$ac_cv_header_netdb_h" >&6
-
- fi
- if test $ac_cv_header_netdb_h = yes; then
- :
- else
- { { echo "$as_me:$LINENO: error: \"*** no netdb.h\"" >&5
- echo "$as_me: error: \"*** no netdb.h\"" >&2;}
- { (exit 1); exit 1; }; }
- fi
-
-
- if test "${ac_cv_header_netinet_in_h+set}" = set; then
- echo "$as_me:$LINENO: checking for netinet/in.h" >&5
- echo $ECHO_N "checking for netinet/in.h... $ECHO_C" >&6
- if test "${ac_cv_header_netinet_in_h+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- fi
- echo "$as_me:$LINENO: result: $ac_cv_header_netinet_in_h" >&5
- echo "${ECHO_T}$ac_cv_header_netinet_in_h" >&6
- else
- # Is the header compilable?
- echo "$as_me:$LINENO: checking netinet/in.h usability" >&5
- echo $ECHO_N "checking netinet/in.h usability... $ECHO_C" >&6
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
- #include <netinet/in.h>
- _ACEOF
- rm -f conftest.$ac_objext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- ac_header_compiler=yes
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_header_compiler=no
- fi
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
- echo "${ECHO_T}$ac_header_compiler" >&6
-
- # Is the header present?
- echo "$as_me:$LINENO: checking netinet/in.h presence" >&5
- echo $ECHO_N "checking netinet/in.h presence... $ECHO_C" >&6
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- #include <netinet/in.h>
- _ACEOF
- if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null; then
- if test -s conftest.err; then
- ac_cpp_err=$ac_c_preproc_warn_flag
- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
- else
- ac_cpp_err=
- fi
- else
- ac_cpp_err=yes
- fi
- if test -z "$ac_cpp_err"; then
- ac_header_preproc=yes
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_header_preproc=no
- fi
- rm -f conftest.err conftest.$ac_ext
- echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
- echo "${ECHO_T}$ac_header_preproc" >&6
-
- # So? What about this header?
- case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
- yes:no: )
- { echo "$as_me:$LINENO: WARNING: netinet/in.h: accepted by the compiler, rejected by the preprocessor!" >&5
- echo "$as_me: WARNING: netinet/in.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
- { echo "$as_me:$LINENO: WARNING: netinet/in.h: proceeding with the compiler's result" >&5
- echo "$as_me: WARNING: netinet/in.h: proceeding with the compiler's result" >&2;}
- ac_header_preproc=yes
- ;;
- no:yes:* )
- { echo "$as_me:$LINENO: WARNING: netinet/in.h: present but cannot be compiled" >&5
- echo "$as_me: WARNING: netinet/in.h: present but cannot be compiled" >&2;}
- { echo "$as_me:$LINENO: WARNING: netinet/in.h: check for missing prerequisite headers?" >&5
- echo "$as_me: WARNING: netinet/in.h: check for missing prerequisite headers?" >&2;}
- { echo "$as_me:$LINENO: WARNING: netinet/in.h: see the Autoconf documentation" >&5
- echo "$as_me: WARNING: netinet/in.h: see the Autoconf documentation" >&2;}
- { echo "$as_me:$LINENO: WARNING: netinet/in.h: section \"Present But Cannot Be Compiled\"" >&5
- echo "$as_me: WARNING: netinet/in.h: section \"Present But Cannot Be Compiled\"" >&2;}
- { echo "$as_me:$LINENO: WARNING: netinet/in.h: proceeding with the preprocessor's result" >&5
- echo "$as_me: WARNING: netinet/in.h: proceeding with the preprocessor's result" >&2;}
- { echo "$as_me:$LINENO: WARNING: netinet/in.h: in the future, the compiler will take precedence" >&5
- echo "$as_me: WARNING: netinet/in.h: in the future, the compiler will take precedence" >&2;}
- (
- cat <<\_ASBOX
- ## ------------------------------------------ ##
- ## Report this to the AC_PACKAGE_NAME lists. ##
- ## ------------------------------------------ ##
- _ASBOX
- ) |
- sed "s/^/$as_me: WARNING: /" >&2
- ;;
- esac
- echo "$as_me:$LINENO: checking for netinet/in.h" >&5
- echo $ECHO_N "checking for netinet/in.h... $ECHO_C" >&6
- if test "${ac_cv_header_netinet_in_h+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- ac_cv_header_netinet_in_h=$ac_header_preproc
- fi
- echo "$as_me:$LINENO: result: $ac_cv_header_netinet_in_h" >&5
- echo "${ECHO_T}$ac_cv_header_netinet_in_h" >&6
-
- fi
- if test $ac_cv_header_netinet_in_h = yes; then
- :
- else
- { { echo "$as_me:$LINENO: error: \"*** no netinet/in.h\"" >&5
- echo "$as_me: error: \"*** no netinet/in.h\"" >&2;}
- { (exit 1); exit 1; }; }
- fi
-
-
- if test "${ac_cv_header_netinet_tcp_h+set}" = set; then
- echo "$as_me:$LINENO: checking for netinet/tcp.h" >&5
- echo $ECHO_N "checking for netinet/tcp.h... $ECHO_C" >&6
- if test "${ac_cv_header_netinet_tcp_h+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- fi
- echo "$as_me:$LINENO: result: $ac_cv_header_netinet_tcp_h" >&5
- echo "${ECHO_T}$ac_cv_header_netinet_tcp_h" >&6
- else
- # Is the header compilable?
- echo "$as_me:$LINENO: checking netinet/tcp.h usability" >&5
- echo $ECHO_N "checking netinet/tcp.h usability... $ECHO_C" >&6
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
- #include <netinet/tcp.h>
- _ACEOF
- rm -f conftest.$ac_objext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- ac_header_compiler=yes
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_header_compiler=no
- fi
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
- echo "${ECHO_T}$ac_header_compiler" >&6
-
- # Is the header present?
- echo "$as_me:$LINENO: checking netinet/tcp.h presence" >&5
- echo $ECHO_N "checking netinet/tcp.h presence... $ECHO_C" >&6
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- #include <netinet/tcp.h>
- _ACEOF
- if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null; then
- if test -s conftest.err; then
- ac_cpp_err=$ac_c_preproc_warn_flag
- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
- else
- ac_cpp_err=
- fi
- else
- ac_cpp_err=yes
- fi
- if test -z "$ac_cpp_err"; then
- ac_header_preproc=yes
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_header_preproc=no
- fi
- rm -f conftest.err conftest.$ac_ext
- echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
- echo "${ECHO_T}$ac_header_preproc" >&6
-
- # So? What about this header?
- case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
- yes:no: )
- { echo "$as_me:$LINENO: WARNING: netinet/tcp.h: accepted by the compiler, rejected by the preprocessor!" >&5
- echo "$as_me: WARNING: netinet/tcp.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
- { echo "$as_me:$LINENO: WARNING: netinet/tcp.h: proceeding with the compiler's result" >&5
- echo "$as_me: WARNING: netinet/tcp.h: proceeding with the compiler's result" >&2;}
- ac_header_preproc=yes
- ;;
- no:yes:* )
- { echo "$as_me:$LINENO: WARNING: netinet/tcp.h: present but cannot be compiled" >&5
- echo "$as_me: WARNING: netinet/tcp.h: present but cannot be compiled" >&2;}
- { echo "$as_me:$LINENO: WARNING: netinet/tcp.h: check for missing prerequisite headers?" >&5
- echo "$as_me: WARNING: netinet/tcp.h: check for missing prerequisite headers?" >&2;}
- { echo "$as_me:$LINENO: WARNING: netinet/tcp.h: see the Autoconf documentation" >&5
- echo "$as_me: WARNING: netinet/tcp.h: see the Autoconf documentation" >&2;}
- { echo "$as_me:$LINENO: WARNING: netinet/tcp.h: section \"Present But Cannot Be Compiled\"" >&5
- echo "$as_me: WARNING: netinet/tcp.h: section \"Present But Cannot Be Compiled\"" >&2;}
- { echo "$as_me:$LINENO: WARNING: netinet/tcp.h: proceeding with the preprocessor's result" >&5
- echo "$as_me: WARNING: netinet/tcp.h: proceeding with the preprocessor's result" >&2;}
- { echo "$as_me:$LINENO: WARNING: netinet/tcp.h: in the future, the compiler will take precedence" >&5
- echo "$as_me: WARNING: netinet/tcp.h: in the future, the compiler will take precedence" >&2;}
- (
- cat <<\_ASBOX
- ## ------------------------------------------ ##
- ## Report this to the AC_PACKAGE_NAME lists. ##
- ## ------------------------------------------ ##
- _ASBOX
- ) |
- sed "s/^/$as_me: WARNING: /" >&2
- ;;
- esac
- echo "$as_me:$LINENO: checking for netinet/tcp.h" >&5
- echo $ECHO_N "checking for netinet/tcp.h... $ECHO_C" >&6
- if test "${ac_cv_header_netinet_tcp_h+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- ac_cv_header_netinet_tcp_h=$ac_header_preproc
- fi
- echo "$as_me:$LINENO: result: $ac_cv_header_netinet_tcp_h" >&5
- echo "${ECHO_T}$ac_cv_header_netinet_tcp_h" >&6
-
- fi
- if test $ac_cv_header_netinet_tcp_h = yes; then
- :
- else
- { { echo "$as_me:$LINENO: error: \"*** no netinet/tcp.h\"" >&5
- echo "$as_me: error: \"*** no netinet/tcp.h\"" >&2;}
- { (exit 1); exit 1; }; }
- fi
-
-
if test "${ac_cv_header_sys_param_h+set}" = set; then
echo "$as_me:$LINENO: checking for sys/param.h" >&5
echo $ECHO_N "checking for sys/param.h... $ECHO_C" >&6
--- 20719,20724 ----
***************
*** 21303,21454 ****
fi
- if test "${ac_cv_header_sys_socket_h+set}" = set; then
- echo "$as_me:$LINENO: checking for sys/socket.h" >&5
- echo $ECHO_N "checking for sys/socket.h... $ECHO_C" >&6
- if test "${ac_cv_header_sys_socket_h+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- fi
- echo "$as_me:$LINENO: result: $ac_cv_header_sys_socket_h" >&5
- echo "${ECHO_T}$ac_cv_header_sys_socket_h" >&6
- else
- # Is the header compilable?
- echo "$as_me:$LINENO: checking sys/socket.h usability" >&5
- echo $ECHO_N "checking sys/socket.h usability... $ECHO_C" >&6
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
- #include <sys/socket.h>
- _ACEOF
- rm -f conftest.$ac_objext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- ac_header_compiler=yes
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_header_compiler=no
- fi
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
- echo "${ECHO_T}$ac_header_compiler" >&6
-
- # Is the header present?
- echo "$as_me:$LINENO: checking sys/socket.h presence" >&5
- echo $ECHO_N "checking sys/socket.h presence... $ECHO_C" >&6
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- #include <sys/socket.h>
- _ACEOF
- if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null; then
- if test -s conftest.err; then
- ac_cpp_err=$ac_c_preproc_warn_flag
- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
- else
- ac_cpp_err=
- fi
- else
- ac_cpp_err=yes
- fi
- if test -z "$ac_cpp_err"; then
- ac_header_preproc=yes
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_header_preproc=no
- fi
- rm -f conftest.err conftest.$ac_ext
- echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
- echo "${ECHO_T}$ac_header_preproc" >&6
-
- # So? What about this header?
- case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
- yes:no: )
- { echo "$as_me:$LINENO: WARNING: sys/socket.h: accepted by the compiler, rejected by the preprocessor!" >&5
- echo "$as_me: WARNING: sys/socket.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
- { echo "$as_me:$LINENO: WARNING: sys/socket.h: proceeding with the compiler's result" >&5
- echo "$as_me: WARNING: sys/socket.h: proceeding with the compiler's result" >&2;}
- ac_header_preproc=yes
- ;;
- no:yes:* )
- { echo "$as_me:$LINENO: WARNING: sys/socket.h: present but cannot be compiled" >&5
- echo "$as_me: WARNING: sys/socket.h: present but cannot be compiled" >&2;}
- { echo "$as_me:$LINENO: WARNING: sys/socket.h: check for missing prerequisite headers?" >&5
- echo "$as_me: WARNING: sys/socket.h: check for missing prerequisite headers?" >&2;}
- { echo "$as_me:$LINENO: WARNING: sys/socket.h: see the Autoconf documentation" >&5
- echo "$as_me: WARNING: sys/socket.h: see the Autoconf documentation" >&2;}
- { echo "$as_me:$LINENO: WARNING: sys/socket.h: section \"Present But Cannot Be Compiled\"" >&5
- echo "$as_me: WARNING: sys/socket.h: section \"Present But Cannot Be Compiled\"" >&2;}
- { echo "$as_me:$LINENO: WARNING: sys/socket.h: proceeding with the preprocessor's result" >&5
- echo "$as_me: WARNING: sys/socket.h: proceeding with the preprocessor's result" >&2;}
- { echo "$as_me:$LINENO: WARNING: sys/socket.h: in the future, the compiler will take precedence" >&5
- echo "$as_me: WARNING: sys/socket.h: in the future, the compiler will take precedence" >&2;}
- (
- cat <<\_ASBOX
- ## ------------------------------------------ ##
- ## Report this to the AC_PACKAGE_NAME lists. ##
- ## ------------------------------------------ ##
- _ASBOX
- ) |
- sed "s/^/$as_me: WARNING: /" >&2
- ;;
- esac
- echo "$as_me:$LINENO: checking for sys/socket.h" >&5
- echo $ECHO_N "checking for sys/socket.h... $ECHO_C" >&6
- if test "${ac_cv_header_sys_socket_h+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- ac_cv_header_sys_socket_h=$ac_header_preproc
- fi
- echo "$as_me:$LINENO: result: $ac_cv_header_sys_socket_h" >&5
- echo "${ECHO_T}$ac_cv_header_sys_socket_h" >&6
-
- fi
- if test $ac_cv_header_sys_socket_h = yes; then
- :
- else
- { { echo "$as_me:$LINENO: error: \"*** no sys/socket.h\"" >&5
- echo "$as_me: error: \"*** no sys/socket.h\"" >&2;}
- { (exit 1); exit 1; }; }
- fi
-
-
if test "${ac_cv_header_sys_time_h+set}" = set; then
echo "$as_me:$LINENO: checking for sys/time.h" >&5
echo $ECHO_N "checking for sys/time.h... $ECHO_C" >&6
--- 20865,20870 ----
***************
*** 21595,21746 ****
fi
- if test "${ac_cv_header_sys_un_h+set}" = set; then
- echo "$as_me:$LINENO: checking for sys/un.h" >&5
- echo $ECHO_N "checking for sys/un.h... $ECHO_C" >&6
- if test "${ac_cv_header_sys_un_h+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- fi
- echo "$as_me:$LINENO: result: $ac_cv_header_sys_un_h" >&5
- echo "${ECHO_T}$ac_cv_header_sys_un_h" >&6
- else
- # Is the header compilable?
- echo "$as_me:$LINENO: checking sys/un.h usability" >&5
- echo $ECHO_N "checking sys/un.h usability... $ECHO_C" >&6
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
- #include <sys/un.h>
- _ACEOF
- rm -f conftest.$ac_objext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- ac_header_compiler=yes
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_header_compiler=no
- fi
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
- echo "${ECHO_T}$ac_header_compiler" >&6
-
- # Is the header present?
- echo "$as_me:$LINENO: checking sys/un.h presence" >&5
- echo $ECHO_N "checking sys/un.h presence... $ECHO_C" >&6
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- #include <sys/un.h>
- _ACEOF
- if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null; then
- if test -s conftest.err; then
- ac_cpp_err=$ac_c_preproc_warn_flag
- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
- else
- ac_cpp_err=
- fi
- else
- ac_cpp_err=yes
- fi
- if test -z "$ac_cpp_err"; then
- ac_header_preproc=yes
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_header_preproc=no
- fi
- rm -f conftest.err conftest.$ac_ext
- echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
- echo "${ECHO_T}$ac_header_preproc" >&6
-
- # So? What about this header?
- case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
- yes:no: )
- { echo "$as_me:$LINENO: WARNING: sys/un.h: accepted by the compiler, rejected by the preprocessor!" >&5
- echo "$as_me: WARNING: sys/un.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
- { echo "$as_me:$LINENO: WARNING: sys/un.h: proceeding with the compiler's result" >&5
- echo "$as_me: WARNING: sys/un.h: proceeding with the compiler's result" >&2;}
- ac_header_preproc=yes
- ;;
- no:yes:* )
- { echo "$as_me:$LINENO: WARNING: sys/un.h: present but cannot be compiled" >&5
- echo "$as_me: WARNING: sys/un.h: present but cannot be compiled" >&2;}
- { echo "$as_me:$LINENO: WARNING: sys/un.h: check for missing prerequisite headers?" >&5
- echo "$as_me: WARNING: sys/un.h: check for missing prerequisite headers?" >&2;}
- { echo "$as_me:$LINENO: WARNING: sys/un.h: see the Autoconf documentation" >&5
- echo "$as_me: WARNING: sys/un.h: see the Autoconf documentation" >&2;}
- { echo "$as_me:$LINENO: WARNING: sys/un.h: section \"Present But Cannot Be Compiled\"" >&5
- echo "$as_me: WARNING: sys/un.h: section \"Present But Cannot Be Compiled\"" >&2;}
- { echo "$as_me:$LINENO: WARNING: sys/un.h: proceeding with the preprocessor's result" >&5
- echo "$as_me: WARNING: sys/un.h: proceeding with the preprocessor's result" >&2;}
- { echo "$as_me:$LINENO: WARNING: sys/un.h: in the future, the compiler will take precedence" >&5
- echo "$as_me: WARNING: sys/un.h: in the future, the compiler will take precedence" >&2;}
- (
- cat <<\_ASBOX
- ## ------------------------------------------ ##
- ## Report this to the AC_PACKAGE_NAME lists. ##
- ## ------------------------------------------ ##
- _ASBOX
- ) |
- sed "s/^/$as_me: WARNING: /" >&2
- ;;
- esac
- echo "$as_me:$LINENO: checking for sys/un.h" >&5
- echo $ECHO_N "checking for sys/un.h... $ECHO_C" >&6
- if test "${ac_cv_header_sys_un_h+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- ac_cv_header_sys_un_h=$ac_header_preproc
- fi
- echo "$as_me:$LINENO: result: $ac_cv_header_sys_un_h" >&5
- echo "${ECHO_T}$ac_cv_header_sys_un_h" >&6
-
- fi
- if test $ac_cv_header_sys_un_h = yes; then
- :
- else
- { { echo "$as_me:$LINENO: error: \"*** no sys/un.h\"" >&5
- echo "$as_me: error: \"*** no sys/un.h\"" >&2;}
- { (exit 1); exit 1; }; }
- fi
-
-
if test "${ac_cv_header_unistd_h+set}" = set; then
echo "$as_me:$LINENO: checking for unistd.h" >&5
echo $ECHO_N "checking for unistd.h... $ECHO_C" >&6
--- 21011,21016 ----
diff -rc toolbuslib-1.1/src/atb-tool.c toolbuslib-1.1-new/src/atb-tool.c
*** toolbuslib-1.1/src/atb-tool.c 2008-11-10 13:59:41.000000000 +0100
--- toolbuslib-1.1-new/src/atb-tool.c 2010-08-23 16:58:11.000000000 +0200
***************
*** 6,22 ****
#include <stdlib.h>
#include <unistd.h>
#include <errno.h>
- #include <netdb.h>
- #include <sys/socket.h>
#include <sys/time.h>
- #include <sys/un.h>
#include <sys/param.h>
- #include <netinet/in.h>
- #include <netinet/tcp.h>
#include <signal.h>
#include <string.h>
!
! #include <sys/resource.h>
#include <aterm2.h>
#include "safio.h"
--- 6,16 ----
#include <stdlib.h>
#include <unistd.h>
#include <errno.h>
#include <sys/time.h>
#include <sys/param.h>
#include <signal.h>
#include <string.h>
! #include <winsock2.h>
#include <aterm2.h>
#include "safio.h"
***************
*** 39,44 ****
--- 33,40 ----
#define MAX_NR_QUEUES 64
#define MAX_QUEUE_LEN 128
+ #define MAXHOSTNAMELEN 256
+
/* Operation codes. */
/* From Tool to ToolBus. */
#define CONNECT 1
***************
*** 144,151 ****
* Gathers performance stats.
*/
static ATerm getPerformanceStats(){
- struct rusage resourceUsage;
-
// Type stuff
ATerm remote = (ATerm) ATmakeAppl0(ATmakeAFun("remote", 0, ATtrue));
ATerm toolType = (ATerm) ATmakeAppl1(ATmakeAFun("type", 1, ATfalse), remote);
--- 140,145 ----
***************
*** 161,171 ****
// Thread stuff
ATerm threads;
- getrusage(RUSAGE_SELF, &resourceUsage);
-
{
! int userTime = (int) (resourceUsage.ru_utime.tv_sec * 1000) + (resourceUsage.ru_utime.tv_usec / 1000);
! int systemTime = (int) (resourceUsage.ru_stime.tv_sec * 1000) + (resourceUsage.ru_stime.tv_usec / 1000);
ATerm userTimeTerm = (ATerm) ATmakeAppl1(ATmakeAFun("user-time", 1, ATfalse), (ATerm) ATmakeInt(userTime));
ATerm systemTimeTerm = (ATerm) ATmakeAppl1(ATmakeAFun("system-time", 1, ATfalse), (ATerm) ATmakeInt(systemTime));
--- 155,163 ----
// Thread stuff
ATerm threads;
{
! int userTime = 0;
! int systemTime = 0;
ATerm userTimeTerm = (ATerm) ATmakeAppl1(ATmakeAFun("user-time", 1, ATfalse), (ATerm) ATmakeInt(userTime));
ATerm systemTimeTerm = (ATerm) ATmakeAppl1(ATmakeAFun("system-time", 1, ATfalse), (ATerm) ATmakeInt(systemTime));
***************
*** 349,364 ****
otp = (OperationTermPair) malloc(sizeof(struct _OperationTermPair));
- /* Initialize handlers for OS signals */
- {
- struct sigaction disconnect;
- disconnect.sa_handler = disconnectHandler;
- sigemptyset(&disconnect.sa_mask);
-
- sigaction(SIGTERM, &disconnect, NULL);
- sigaction(SIGQUIT, &disconnect, NULL);
- }
-
/* Get hostname of machine that runs this particular tool */
return gethostname(this_host, MAXHOSTNAMELEN);
}
--- 341,346 ----
diff -rc toolbuslib-1.1/src/Makefile.in toolbuslib-1.1-new/src/Makefile.in
*** toolbuslib-1.1/src/Makefile.in 2008-11-10 13:59:47.000000000 +0100
--- toolbuslib-1.1-new/src/Makefile.in 2010-08-24 10:28:10.000000000 +0200
***************
*** 223,234 ****
libATB_la_SOURCES = atb-tool.c
libATB_la_CPPFLAGS = $(ATERM_CFLAGS)
libATB_la_LDFLAGS = -avoid-version -no-undefined $(AM_LDFLAGS)
! libATB_la_LIBADD = $(ATERM_LIBS) $(SOCKETLIBS)
bin_PROGRAMS = tbunpack
tbunpack_SOURCES = tbunpack.c atb-tool.c
! tbunpack_LDADD = $(ATERM_LIBS)
subdir = ./src
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
--- 223,234 ----
libATB_la_SOURCES = atb-tool.c
libATB_la_CPPFLAGS = $(ATERM_CFLAGS)
libATB_la_LDFLAGS = -avoid-version -no-undefined $(AM_LDFLAGS)
! libATB_la_LIBADD = $(ATERM_LIBS) $(SOCKETLIBS) -lwsock32
bin_PROGRAMS = tbunpack
tbunpack_SOURCES = tbunpack.c atb-tool.c
! tbunpack_LDADD = $(ATERM_LIBS) -lwsock32
subdir = ./src
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs

23
pkgs/top-level/all-packages.nix
View file

@ -2566,9 +2566,7 @@ let
aterm25 = callPackage ../development/libraries/aterm/2.5.nix { };
aterm28 = lowPrio (import ../development/libraries/aterm/2.8.nix {
inherit fetchurl stdenv;
});
aterm28 = lowPrio (callPackage ../development/libraries/aterm/2.8.nix { });
attr = callPackage ../development/libraries/attr { };
@ -3490,6 +3488,23 @@ let
lipo = if stdenv.isDarwin then darwinLipoUtility else null;
};
metaEnvironment = recurseIntoAttrs (let callPackage = newScope pkgs.metaEnvironment; in rec {
sdfLibrary = callPackage ../development/libraries/sdf-library { aterm = aterm28; };
toolbuslib = callPackage ../development/libraries/toolbuslib { aterm = aterm28; inherit (windows) w32api; };
cLibrary = callPackage ../development/libraries/c-library { aterm = aterm28; };
errorSupport = callPackage ../development/libraries/error-support { aterm = aterm28; };
ptSupport = callPackage ../development/libraries/pt-support { aterm = aterm28; };
ptableSupport = callPackage ../development/libraries/ptable-support { aterm = aterm28; };
configSupport = callPackage ../development/libraries/config-support { aterm = aterm28; };
asfSupport = callPackage ../development/libraries/asf-support { aterm = aterm28; };
tideSupport = callPackage ../development/libraries/tide-support { aterm = aterm28; };
rstoreSupport = callPackage ../development/libraries/rstore-support { aterm = aterm28; };
sdfSupport = callPackage ../development/libraries/sdf-support { aterm = aterm28; };
sglr = callPackage ../development/libraries/sglr { aterm = aterm28; };
ascSupport = callPackage ../development/libraries/asc-support { aterm = aterm28; };
pgen = callPackage ../development/libraries/pgen { aterm = aterm28; };
});
ming = callPackage ../development/libraries/ming { };
mlt = callPackage ../development/libraries/mlt {
@ -7011,8 +7026,6 @@ let
inherit texLiveLatexXColor texLivePGF texLive;
};
toolbuslib = callPackage ../development/libraries/toolbuslib { };
trac = callPackage ../misc/trac {
inherit (pythonPackages) pysqlite;
};