getconf: patch is upstreamed.

This commit is contained in:
Adrien Destugues
2017-04-09 21:05:08 +02:00
parent 6249e76b98
commit 3b4239679d
2 changed files with 3 additions and 187 deletions

View File

@@ -5,11 +5,10 @@ confstr(), and pathconf().
"
HOMEPAGE="https://github.com/termux/getconf"
COPYRIGHT="1996, 1998 The NetBSD Foundation, Inc.
2017, Termux"
2017, Fredrik Fornwall"
LICENSE="MIT"
SOURCE_URI="https://github.com/termux/getconf/archive/v0.4.tar.gz"
CHECKSUM_SHA256="3147e45e37ff4d419e67d624a575d03d12115ef73006c31991eedf08316bf6c7"
PATCHES="getconf-$portVersion.patchset"
SOURCE_URI="https://github.com/termux/getconf/archive/v0.5.tar.gz"
CHECKSUM_SHA256="8192701051d2a2bf8d1ae7b1c0922c3f1d4a039b9ad99496636b0122667d595c"
REVISION="1"
ARCHITECTURES="x86_gcc2 x86 x86_64"

View File

@@ -1,183 +0,0 @@
From d0f81128d210d787c74152027435bd84a6a73c87 Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@pulkomandy.tk>
Date: Sun, 2 Apr 2017 11:18:47 +0200
Subject: Fix build under Haiku.
We still don't define many of these variables.
diff --git a/getconf.c b/getconf.c
index 2535a7e..fa67a1d 100644
--- a/getconf.c
+++ b/getconf.c
@@ -53,15 +53,31 @@ static const struct conf_variable conf_table[] = {
#endif
/* Utility Limit Minimum Values */
+#ifdef _POSIX2_BC_BASE_MAX
{ "POSIX2_BC_BASE_MAX", CONSTANT, _POSIX2_BC_BASE_MAX },
+#endif
+#ifdef _POSIX2_BC_DIM_MAX
{ "POSIX2_BC_DIM_MAX", CONSTANT, _POSIX2_BC_DIM_MAX },
+#endif
+#ifdef _POSIX2_BC_SCALE_MAX
{ "POSIX2_BC_SCALE_MAX", CONSTANT, _POSIX2_BC_SCALE_MAX },
+#endif
+#ifdef _POSIX2_BC_STRING_MAX
{ "POSIX2_BC_STRING_MAX", CONSTANT, _POSIX2_BC_STRING_MAX },
+#endif
+#ifdef _POSIX2_COLL_WEIGHTS_MAX
{ "POSIX2_COLL_WEIGHTS_MAX", CONSTANT, _POSIX2_COLL_WEIGHTS_MAX },
+#endif
+#ifdef _POSIX2_EXPR_NEST_MAX
{ "POSIX2_EXPR_NEST_MAX", CONSTANT, _POSIX2_EXPR_NEST_MAX },
+#endif
{ "POSIX2_LINE_MAX", CONSTANT, _POSIX2_LINE_MAX },
+#ifdef _POSIX2_RE_DUP_MAX
{ "POSIX2_RE_DUP_MAX", CONSTANT, _POSIX2_RE_DUP_MAX },
+#endif
+#ifdef _POSIX2_VERSION
{ "POSIX2_VERSION", CONSTANT, _POSIX2_VERSION },
+#endif
/* POSIX.1 Minimum Values */
#ifdef _POSIX_AIO_LISTIO_MAX
@@ -91,33 +107,73 @@ static const struct conf_variable conf_table[] = {
{ "_POSIX_TZNAME_MAX", CONSTANT, _POSIX_TZNAME_MAX },
/* Symbolic Utility Limits */
+#ifdef _SC_BC_BASE_MAX
{ "BC_BASE_MAX", SYSCONF, _SC_BC_BASE_MAX },
+#endif
+#ifdef _SC_BC_DIM_MAX
{ "BC_DIM_MAX", SYSCONF, _SC_BC_DIM_MAX },
+#endif
+#ifdef _SC_BC_SCALE_MAX
{ "BC_SCALE_MAX", SYSCONF, _SC_BC_SCALE_MAX },
+#endif
+#ifdef _SC_BC_STRING_MAX
{ "BC_STRING_MAX", SYSCONF, _SC_BC_STRING_MAX },
+#endif
+#ifdef _SC_COLL_WEIGHTS_MAX
{ "COLL_WEIGHTS_MAX", SYSCONF, _SC_COLL_WEIGHTS_MAX },
+#endif
+#ifdef _SC_EXPR_NEST_MAX
{ "EXPR_NEST_MAX", SYSCONF, _SC_EXPR_NEST_MAX },
+#endif
+#ifdef _SC_LINE_MAX
{ "LINE_MAX", SYSCONF, _SC_LINE_MAX },
+#endif
+#ifdef _SC_RE_DUP_MAX
{ "RE_DUP_MAX", SYSCONF, _SC_RE_DUP_MAX },
+#endif
/* Optional Facility Configuration Values */
+#ifdef _SC_2_C_BIND
{ "_POSIX2_C_BIND", SYSCONF, _SC_2_C_BIND },
+#endif
+#ifdef _SC_2_C_DEV
{ "POSIX2_C_DEV", SYSCONF, _SC_2_C_DEV },
+#endif
+#ifdef _SC_2_C_CHAR_TERM
{ "POSIX2_CHAR_TERM", SYSCONF, _SC_2_CHAR_TERM },
+#endif
+#ifdef _SC_2_C_FORT_DEV
{ "POSIX2_FORT_DEV", SYSCONF, _SC_2_FORT_DEV },
+#endif
+#ifdef _SC_2_C_FORT_RUN
{ "POSIX2_FORT_RUN", SYSCONF, _SC_2_FORT_RUN },
+#endif
+#ifdef _SC_2_C_LOCALEDEF
{ "POSIX2_LOCALEDEF", SYSCONF, _SC_2_LOCALEDEF },
+#endif
+#ifdef _SC_2_SW_DEV
{ "POSIX2_SW_DEV", SYSCONF, _SC_2_SW_DEV },
+#endif
+#ifdef _SC_2_UPE
{ "POSIX2_UPE", SYSCONF, _SC_2_UPE },
+#endif
/* POSIX.1 Configurable System Variables */
+#ifdef _SC_AIO_LISTIO_MAX
{ "AIO_LISTIO_MAX", SYSCONF, _SC_AIO_LISTIO_MAX },
+#endif
+#ifdef _SC_AIO_MAX
{ "AIO_MAX", SYSCONF, _SC_AIO_MAX },
+#endif
{ "ARG_MAX", SYSCONF, _SC_ARG_MAX },
{ "CHILD_MAX", SYSCONF, _SC_CHILD_MAX },
{ "CLK_TCK", SYSCONF, _SC_CLK_TCK },
+#ifdef _SC_MQ_OPEN_MAX
{ "MQ_OPEN_MAX", SYSCONF, _SC_MQ_OPEN_MAX },
+#endif
+#ifdef _SC_MQ_PRIO_MAX
{ "MQ_PRIO_MAX", SYSCONF, _SC_MQ_PRIO_MAX },
+#endif
{ "NGROUPS_MAX", SYSCONF, _SC_NGROUPS_MAX },
{ "OPEN_MAX", SYSCONF, _SC_OPEN_MAX },
{ "STREAM_MAX", SYSCONF, _SC_STREAM_MAX },
@@ -138,24 +194,42 @@ static const struct conf_variable conf_table[] = {
/* POSIX.1b Configurable System Variables */
{ "PAGESIZE", SYSCONF, _SC_PAGESIZE },
+#ifdef _SC_ASYNCHRONOUS_IO
{ "_POSIX_ASYNCHRONOUS_IO", SYSCONF, _SC_ASYNCHRONOUS_IO },
+#endif
+#ifdef _SC_FSYNC
{ "_POSIX_FSYNC", SYSCONF, _SC_FSYNC },
+#endif
{ "_POSIX_MAPPED_FILES", SYSCONF, _SC_MAPPED_FILES },
+#ifdef _SC_MEMLOCK
{ "_POSIX_MEMLOCK", SYSCONF, _SC_MEMLOCK },
+#endif
+#ifdef _SC_MEMLOCK_RANGE
{ "_POSIX_MEMLOCK_RANGE", SYSCONF, _SC_MEMLOCK_RANGE },
+#endif
{ "_POSIX_MEMORY_PROTECTION", SYSCONF, _SC_MEMORY_PROTECTION },
+#ifdef _SC_MESSAGE_PASSING
{ "_POSIX_MESSAGE_PASSING", SYSCONF, _SC_MESSAGE_PASSING },
+#endif
{ "_POSIX_MONOTONIC_CLOCK", SYSCONF, _SC_MONOTONIC_CLOCK },
+#ifdef _SC_PRIORITY_SCHEDULING
{ "_POSIX_PRIORITY_SCHEDULING", SYSCONF, _SC_PRIORITY_SCHEDULING },
+#endif
{ "_POSIX_SEMAPHORES", SYSCONF, _SC_SEMAPHORES },
+#ifdef _SC_SHARED_MEMORY_OBJECTS
{ "_POSIX_SHARED_MEMORY_OBJECTS", SYSCONF, _SC_SHARED_MEMORY_OBJECTS },
+#endif
+#ifdef _SC_SYNCHRONIZED_IO
{ "_POSIX_SYNCHRONIZED_IO", SYSCONF, _SC_SYNCHRONIZED_IO },
+#endif
{ "_POSIX_TIMERS", SYSCONF, _SC_TIMERS },
{ "_POSIX_SYNC_IO", PATHCONF, _PC_SYNC_IO },
/* POSIX.1c Configurable System Variables */
+#ifdef _SC_LOGIN_NAME_MAX
{ "LOGIN_NAME_MAX", SYSCONF, _SC_LOGIN_NAME_MAX },
+#endif
{ "_POSIX_THREADS", SYSCONF, _SC_THREADS },
/* POSIX.1j Configurable System Variables */
@@ -172,7 +246,9 @@ static const struct conf_variable conf_table[] = {
/* XPG4.2 Configurable System Variables */
{ "IOV_MAX", SYSCONF, _SC_IOV_MAX },
{ "PAGE_SIZE", SYSCONF, _SC_PAGE_SIZE },
+#ifdef _SC_XOPEN_SHM
{ "_XOPEN_SHM", SYSCONF, _SC_XOPEN_SHM },
+#endif
/* X/Open CAE Spec. Issue 5 Version 2 Configurable System Variables */
{ "FILESIZEBITS", PATHCONF, _PC_FILESIZEBITS },
@@ -198,7 +274,9 @@ static const struct conf_variable conf_table[] = {
{ "CHAR_MIN", CONSTANT, CHAR_MIN },
{ "INT_MAX", CONSTANT, INT_MAX },
{ "INT_MIN", CONSTANT, INT_MIN },
+#ifdef LONG_BIT
{ "LONG_BIT", CONSTANT, LONG_BIT },
+#endif
{ "LONG_MAX", CONSTANT, LONG_MAX },
{ "LONG_MIN", CONSTANT, LONG_MIN },
{ "SCHAR_MAX", CONSTANT, SCHAR_MAX },
--
2.12.2