sortix-mirror/ports/ag/ag.patch

74 lines
3.0 KiB
Diff

diff --no-dereference -Naur -- ag.normalized/config.sub ag.srctix/config.sub
--- ag.normalized/config.sub 2015-09-11 16:57:50.000000000 +0200
+++ ag.srctix/config.sub 2016-09-29 14:51:16.000000000 +0200
@@ -1373,7 +1373,7 @@
| -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
| -sym* | -kopensolaris* | -plan9* \
| -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
- | -aos* | -aros* \
+ | -aos* | -aros* | -sortix* \
| -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
| -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
| -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
diff --no-dereference -Naur -- ag.normalized/configure ag.srctix/configure
--- ag.normalized/configure 2016-09-24 22:33:17.000000000 +0200
+++ ag.srctix/configure 2016-09-30 01:18:35.280663396 +0200
@@ -4992,8 +4992,7 @@
pthread_create(&th, 0, start_routine, 0);
pthread_join(th, 0);
pthread_attr_init(&attr);
- pthread_cleanup_push(routine, 0);
- pthread_cleanup_pop(0) /* ; */
+ /* ; */
;
return 0;
}
@@ -5216,7 +5215,7 @@
# Run CFLAGS="-pg" ./configure if you want debug symbols
-CFLAGS="$CFLAGS $PTHREAD_CFLAGS $PCRE_CFLAGS -Wall -Wextra -Wformat=2 -Wno-format-nonliteral -Wshadow -Wpointer-arith -Wcast-qual -Wmissing-prototypes -Wno-missing-braces -std=gnu89 -D_GNU_SOURCE -O2"
+CFLAGS="$CFLAGS $PTHREAD_CFLAGS $PCRE_CFLAGS -Wall -Wextra -Wformat=2 -Wno-format-nonliteral -Wshadow -Wpointer-arith -Wmissing-prototypes -Wno-missing-braces -std=gnu89 -D_GNU_SOURCE"
LDFLAGS="$LDFLAGS"
case $host in
diff --no-dereference -Naur -- ag.normalized/src/main.c ag.srctix/src/main.c
--- ag.normalized/src/main.c 2016-09-24 02:56:42.000000000 +0200
+++ ag.srctix/src/main.c 2016-09-30 01:12:20.405612978 +0200
@@ -69,8 +69,10 @@
GetSystemInfo(&si);
num_cores = si.dwNumberOfProcessors;
}
-#else
+#elif defined(_SC_NPROCESSORS_ONLN)
num_cores = (int)sysconf(_SC_NPROCESSORS_ONLN);
+#else
+ num_cores = 1;
#endif
workers_len = num_cores < 8 ? num_cores : 8;
diff --no-dereference -Naur -- ag.normalized/src/options.c ag.srctix/src/options.c
--- ag.normalized/src/options.c 2016-09-25 01:55:10.000000000 +0200
+++ ag.srctix/src/options.c 2016-09-29 14:53:23.000000000 +0200
@@ -4,7 +4,6 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#include <sys/param.h>
#include <sys/stat.h>
#include <unistd.h>
diff --no-dereference -Naur -- ag.normalized/tixbuildinfo ag.srctix/tixbuildinfo
--- ag.normalized/tixbuildinfo 1970-01-01 01:00:00.000000000 +0100
+++ ag.srctix/tixbuildinfo 2016-09-30 00:17:23.748315753 +0200
@@ -0,0 +1,9 @@
+tix.version=1
+tix.class=srctix
+pkg.name=ag
+pkg.build-libraries=libpcre libz xz
+pkg.runtime-programs=git
+pkg.build-system=configure
+pkg.configure.args=
+pkg.make.vars=V=1
+pkg.post-install.cmd=tix-eradicate-libtool-la