* [PR PATCH] lshw: clean up musl patches.
@ 2021-01-11 14:04 ericonr
2021-01-12 3:04 ` [PR PATCH] [Merged]: " ericonr
0 siblings, 1 reply; 2+ messages in thread
From: ericonr @ 2021-01-11 14:04 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 722 bytes --]
There is a new pull request by ericonr against master on the void-packages repository
https://github.com/ericonr/void-packages lshw
https://github.com/void-linux/void-packages/pull/27826
lshw: clean up musl patches.
musl-path_max was no longer necessary, and musl-confname_h was kind of
helping them do the wrong thing. They should just be using the value of
LONG_BIT instead of trying to pass it to sysconf, so the usage was wrong
on glibc and musl. _SC_LONG_BIT is a glibc extension and shouldn't be at
all needed.
Since this does change behavior (sysconf(LONG_BIT) could return
arbitrary values), revbump the package.
A patch file from https://github.com/void-linux/void-packages/pull/27826.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-lshw-27826.patch --]
[-- Type: text/x-diff, Size: 28655 bytes --]
From 3d0ccc38eceb9f09f83d50e9db4a7c029313eef4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Mon, 11 Jan 2021 11:00:37 -0300
Subject: [PATCH] lshw: clean up musl patches.
musl-path_max was no longer necessary, and musl-confname_h was kind of
helping them do the wrong thing. They should just be using the value of
LONG_BIT instead of trying to pass it to sysconf, so the usage was wrong
on glibc and musl. _SC_LONG_BIT is a glibc extension and shouldn't be at
all needed.
Since this does change behavior (sysconf(LONG_BIT) could return
arbitrary values), revbump the package.
---
srcpkgs/lshw/files/confname.h | 676 ---------------------
srcpkgs/lshw/patches/musl-confname_h.patch | 15 -
srcpkgs/lshw/patches/musl-long_bits.patch | 20 +
srcpkgs/lshw/patches/musl-path_max.patch | 12 -
srcpkgs/lshw/template | 7 +-
5 files changed, 21 insertions(+), 709 deletions(-)
delete mode 100644 srcpkgs/lshw/files/confname.h
delete mode 100644 srcpkgs/lshw/patches/musl-confname_h.patch
create mode 100644 srcpkgs/lshw/patches/musl-long_bits.patch
delete mode 100644 srcpkgs/lshw/patches/musl-path_max.patch
diff --git a/srcpkgs/lshw/files/confname.h b/srcpkgs/lshw/files/confname.h
deleted file mode 100644
index 1972849cec3..00000000000
--- a/srcpkgs/lshw/files/confname.h
+++ /dev/null
@@ -1,676 +0,0 @@
-/* `sysconf', `pathconf', and `confstr' NAME values. Generic version.
- Copyright (C) 1993-2015 Free Software Foundation, Inc.
- This file is part of the GNU C Library.
-
- The GNU C Library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
-
- The GNU C Library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with the GNU C Library; if not, see
- <http://www.gnu.org/licenses/>. */
-
-#if !defined(_CONFNAME_H)
-#define _CONFNAME_H
-
-/* Values for the NAME argument to `pathconf' and `fpathconf'. */
-enum
- {
- _PC_LINK_MAX,
-#define _PC_LINK_MAX _PC_LINK_MAX
- _PC_MAX_CANON,
-#define _PC_MAX_CANON _PC_MAX_CANON
- _PC_MAX_INPUT,
-#define _PC_MAX_INPUT _PC_MAX_INPUT
- _PC_NAME_MAX,
-#define _PC_NAME_MAX _PC_NAME_MAX
- _PC_PATH_MAX,
-#define _PC_PATH_MAX _PC_PATH_MAX
- _PC_PIPE_BUF,
-#define _PC_PIPE_BUF _PC_PIPE_BUF
- _PC_CHOWN_RESTRICTED,
-#define _PC_CHOWN_RESTRICTED _PC_CHOWN_RESTRICTED
- _PC_NO_TRUNC,
-#define _PC_NO_TRUNC _PC_NO_TRUNC
- _PC_VDISABLE,
-#define _PC_VDISABLE _PC_VDISABLE
- _PC_SYNC_IO,
-#define _PC_SYNC_IO _PC_SYNC_IO
- _PC_ASYNC_IO,
-#define _PC_ASYNC_IO _PC_ASYNC_IO
- _PC_PRIO_IO,
-#define _PC_PRIO_IO _PC_PRIO_IO
- _PC_SOCK_MAXBUF,
-#define _PC_SOCK_MAXBUF _PC_SOCK_MAXBUF
- _PC_FILESIZEBITS,
-#define _PC_FILESIZEBITS _PC_FILESIZEBITS
- _PC_REC_INCR_XFER_SIZE,
-#define _PC_REC_INCR_XFER_SIZE _PC_REC_INCR_XFER_SIZE
- _PC_REC_MAX_XFER_SIZE,
-#define _PC_REC_MAX_XFER_SIZE _PC_REC_MAX_XFER_SIZE
- _PC_REC_MIN_XFER_SIZE,
-#define _PC_REC_MIN_XFER_SIZE _PC_REC_MIN_XFER_SIZE
- _PC_REC_XFER_ALIGN,
-#define _PC_REC_XFER_ALIGN _PC_REC_XFER_ALIGN
- _PC_ALLOC_SIZE_MIN,
-#define _PC_ALLOC_SIZE_MIN _PC_ALLOC_SIZE_MIN
- _PC_SYMLINK_MAX,
-#define _PC_SYMLINK_MAX _PC_SYMLINK_MAX
- _PC_2_SYMLINKS
-#define _PC_2_SYMLINKS _PC_2_SYMLINKS
- };
-
-/* Values for the argument to `sysconf'. */
-enum
- {
- _SC_ARG_MAX,
-#define _SC_ARG_MAX _SC_ARG_MAX
- _SC_CHILD_MAX,
-#define _SC_CHILD_MAX _SC_CHILD_MAX
- _SC_CLK_TCK,
-#define _SC_CLK_TCK _SC_CLK_TCK
- _SC_NGROUPS_MAX,
-#define _SC_NGROUPS_MAX _SC_NGROUPS_MAX
- _SC_OPEN_MAX,
-#define _SC_OPEN_MAX _SC_OPEN_MAX
- _SC_STREAM_MAX,
-#define _SC_STREAM_MAX _SC_STREAM_MAX
- _SC_TZNAME_MAX,
-#define _SC_TZNAME_MAX _SC_TZNAME_MAX
- _SC_JOB_CONTROL,
-#define _SC_JOB_CONTROL _SC_JOB_CONTROL
- _SC_SAVED_IDS,
-#define _SC_SAVED_IDS _SC_SAVED_IDS
- _SC_REALTIME_SIGNALS,
-#define _SC_REALTIME_SIGNALS _SC_REALTIME_SIGNALS
- _SC_PRIORITY_SCHEDULING,
-#define _SC_PRIORITY_SCHEDULING _SC_PRIORITY_SCHEDULING
- _SC_TIMERS,
-#define _SC_TIMERS _SC_TIMERS
- _SC_ASYNCHRONOUS_IO,
-#define _SC_ASYNCHRONOUS_IO _SC_ASYNCHRONOUS_IO
- _SC_PRIORITIZED_IO,
-#define _SC_PRIORITIZED_IO _SC_PRIORITIZED_IO
- _SC_SYNCHRONIZED_IO,
-#define _SC_SYNCHRONIZED_IO _SC_SYNCHRONIZED_IO
- _SC_FSYNC,
-#define _SC_FSYNC _SC_FSYNC
- _SC_MAPPED_FILES,
-#define _SC_MAPPED_FILES _SC_MAPPED_FILES
- _SC_MEMLOCK,
-#define _SC_MEMLOCK _SC_MEMLOCK
- _SC_MEMLOCK_RANGE,
-#define _SC_MEMLOCK_RANGE _SC_MEMLOCK_RANGE
- _SC_MEMORY_PROTECTION,
-#define _SC_MEMORY_PROTECTION _SC_MEMORY_PROTECTION
- _SC_MESSAGE_PASSING,
-#define _SC_MESSAGE_PASSING _SC_MESSAGE_PASSING
- _SC_SEMAPHORES,
-#define _SC_SEMAPHORES _SC_SEMAPHORES
- _SC_SHARED_MEMORY_OBJECTS,
-#define _SC_SHARED_MEMORY_OBJECTS _SC_SHARED_MEMORY_OBJECTS
- _SC_AIO_LISTIO_MAX,
-#define _SC_AIO_LISTIO_MAX _SC_AIO_LISTIO_MAX
- _SC_AIO_MAX,
-#define _SC_AIO_MAX _SC_AIO_MAX
- _SC_AIO_PRIO_DELTA_MAX,
-#define _SC_AIO_PRIO_DELTA_MAX _SC_AIO_PRIO_DELTA_MAX
- _SC_DELAYTIMER_MAX,
-#define _SC_DELAYTIMER_MAX _SC_DELAYTIMER_MAX
- _SC_MQ_OPEN_MAX,
-#define _SC_MQ_OPEN_MAX _SC_MQ_OPEN_MAX
- _SC_MQ_PRIO_MAX,
-#define _SC_MQ_PRIO_MAX _SC_MQ_PRIO_MAX
- _SC_VERSION,
-#define _SC_VERSION _SC_VERSION
- _SC_PAGESIZE,
-#define _SC_PAGESIZE _SC_PAGESIZE
-#define _SC_PAGE_SIZE _SC_PAGESIZE
- _SC_RTSIG_MAX,
-#define _SC_RTSIG_MAX _SC_RTSIG_MAX
- _SC_SEM_NSEMS_MAX,
-#define _SC_SEM_NSEMS_MAX _SC_SEM_NSEMS_MAX
- _SC_SEM_VALUE_MAX,
-#define _SC_SEM_VALUE_MAX _SC_SEM_VALUE_MAX
- _SC_SIGQUEUE_MAX,
-#define _SC_SIGQUEUE_MAX _SC_SIGQUEUE_MAX
- _SC_TIMER_MAX,
-#define _SC_TIMER_MAX _SC_TIMER_MAX
-
- /* Values for the argument to `sysconf'
- corresponding to _POSIX2_* symbols. */
- _SC_BC_BASE_MAX,
-#define _SC_BC_BASE_MAX _SC_BC_BASE_MAX
- _SC_BC_DIM_MAX,
-#define _SC_BC_DIM_MAX _SC_BC_DIM_MAX
- _SC_BC_SCALE_MAX,
-#define _SC_BC_SCALE_MAX _SC_BC_SCALE_MAX
- _SC_BC_STRING_MAX,
-#define _SC_BC_STRING_MAX _SC_BC_STRING_MAX
- _SC_COLL_WEIGHTS_MAX,
-#define _SC_COLL_WEIGHTS_MAX _SC_COLL_WEIGHTS_MAX
- _SC_EQUIV_CLASS_MAX,
-#define _SC_EQUIV_CLASS_MAX _SC_EQUIV_CLASS_MAX
- _SC_EXPR_NEST_MAX,
-#define _SC_EXPR_NEST_MAX _SC_EXPR_NEST_MAX
- _SC_LINE_MAX,
-#define _SC_LINE_MAX _SC_LINE_MAX
- _SC_RE_DUP_MAX,
-#define _SC_RE_DUP_MAX _SC_RE_DUP_MAX
- _SC_CHARCLASS_NAME_MAX,
-#define _SC_CHARCLASS_NAME_MAX _SC_CHARCLASS_NAME_MAX
-
- _SC_2_VERSION,
-#define _SC_2_VERSION _SC_2_VERSION
- _SC_2_C_BIND,
-#define _SC_2_C_BIND _SC_2_C_BIND
- _SC_2_C_DEV,
-#define _SC_2_C_DEV _SC_2_C_DEV
- _SC_2_FORT_DEV,
-#define _SC_2_FORT_DEV _SC_2_FORT_DEV
- _SC_2_FORT_RUN,
-#define _SC_2_FORT_RUN _SC_2_FORT_RUN
- _SC_2_SW_DEV,
-#define _SC_2_SW_DEV _SC_2_SW_DEV
- _SC_2_LOCALEDEF,
-#define _SC_2_LOCALEDEF _SC_2_LOCALEDEF
-
- _SC_PII,
-#define _SC_PII _SC_PII
- _SC_PII_XTI,
-#define _SC_PII_XTI _SC_PII_XTI
- _SC_PII_SOCKET,
-#define _SC_PII_SOCKET _SC_PII_SOCKET
- _SC_PII_INTERNET,
-#define _SC_PII_INTERNET _SC_PII_INTERNET
- _SC_PII_OSI,
-#define _SC_PII_OSI _SC_PII_OSI
- _SC_POLL,
-#define _SC_POLL _SC_POLL
- _SC_SELECT,
-#define _SC_SELECT _SC_SELECT
- _SC_UIO_MAXIOV,
-#define _SC_UIO_MAXIOV _SC_UIO_MAXIOV
- _SC_IOV_MAX = _SC_UIO_MAXIOV,
-#define _SC_IOV_MAX _SC_IOV_MAX
- _SC_PII_INTERNET_STREAM,
-#define _SC_PII_INTERNET_STREAM _SC_PII_INTERNET_STREAM
- _SC_PII_INTERNET_DGRAM,
-#define _SC_PII_INTERNET_DGRAM _SC_PII_INTERNET_DGRAM
- _SC_PII_OSI_COTS,
-#define _SC_PII_OSI_COTS _SC_PII_OSI_COTS
- _SC_PII_OSI_CLTS,
-#define _SC_PII_OSI_CLTS _SC_PII_OSI_CLTS
- _SC_PII_OSI_M,
-#define _SC_PII_OSI_M _SC_PII_OSI_M
- _SC_T_IOV_MAX,
-#define _SC_T_IOV_MAX _SC_T_IOV_MAX
-
- /* Values according to POSIX 1003.1c (POSIX threads). */
- _SC_THREADS,
-#define _SC_THREADS _SC_THREADS
- _SC_THREAD_SAFE_FUNCTIONS,
-#define _SC_THREAD_SAFE_FUNCTIONS _SC_THREAD_SAFE_FUNCTIONS
- _SC_GETGR_R_SIZE_MAX,
-#define _SC_GETGR_R_SIZE_MAX _SC_GETGR_R_SIZE_MAX
- _SC_GETPW_R_SIZE_MAX,
-#define _SC_GETPW_R_SIZE_MAX _SC_GETPW_R_SIZE_MAX
- _SC_LOGIN_NAME_MAX,
-#define _SC_LOGIN_NAME_MAX _SC_LOGIN_NAME_MAX
- _SC_TTY_NAME_MAX,
-#define _SC_TTY_NAME_MAX _SC_TTY_NAME_MAX
- _SC_THREAD_DESTRUCTOR_ITERATIONS,
-#define _SC_THREAD_DESTRUCTOR_ITERATIONS _SC_THREAD_DESTRUCTOR_ITERATIONS
- _SC_THREAD_KEYS_MAX,
-#define _SC_THREAD_KEYS_MAX _SC_THREAD_KEYS_MAX
- _SC_THREAD_STACK_MIN,
-#define _SC_THREAD_STACK_MIN _SC_THREAD_STACK_MIN
- _SC_THREAD_THREADS_MAX,
-#define _SC_THREAD_THREADS_MAX _SC_THREAD_THREADS_MAX
- _SC_THREAD_ATTR_STACKADDR,
-#define _SC_THREAD_ATTR_STACKADDR _SC_THREAD_ATTR_STACKADDR
- _SC_THREAD_ATTR_STACKSIZE,
-#define _SC_THREAD_ATTR_STACKSIZE _SC_THREAD_ATTR_STACKSIZE
- _SC_THREAD_PRIORITY_SCHEDULING,
-#define _SC_THREAD_PRIORITY_SCHEDULING _SC_THREAD_PRIORITY_SCHEDULING
- _SC_THREAD_PRIO_INHERIT,
-#define _SC_THREAD_PRIO_INHERIT _SC_THREAD_PRIO_INHERIT
- _SC_THREAD_PRIO_PROTECT,
-#define _SC_THREAD_PRIO_PROTECT _SC_THREAD_PRIO_PROTECT
- _SC_THREAD_PROCESS_SHARED,
-#define _SC_THREAD_PROCESS_SHARED _SC_THREAD_PROCESS_SHARED
-
- _SC_NPROCESSORS_CONF,
-#define _SC_NPROCESSORS_CONF _SC_NPROCESSORS_CONF
- _SC_NPROCESSORS_ONLN,
-#define _SC_NPROCESSORS_ONLN _SC_NPROCESSORS_ONLN
- _SC_PHYS_PAGES,
-#define _SC_PHYS_PAGES _SC_PHYS_PAGES
- _SC_AVPHYS_PAGES,
-#define _SC_AVPHYS_PAGES _SC_AVPHYS_PAGES
- _SC_ATEXIT_MAX,
-#define _SC_ATEXIT_MAX _SC_ATEXIT_MAX
- _SC_PASS_MAX,
-#define _SC_PASS_MAX _SC_PASS_MAX
-
- _SC_XOPEN_VERSION,
-#define _SC_XOPEN_VERSION _SC_XOPEN_VERSION
- _SC_XOPEN_XCU_VERSION,
-#define _SC_XOPEN_XCU_VERSION _SC_XOPEN_XCU_VERSION
- _SC_XOPEN_UNIX,
-#define _SC_XOPEN_UNIX _SC_XOPEN_UNIX
- _SC_XOPEN_CRYPT,
-#define _SC_XOPEN_CRYPT _SC_XOPEN_CRYPT
- _SC_XOPEN_ENH_I18N,
-#define _SC_XOPEN_ENH_I18N _SC_XOPEN_ENH_I18N
- _SC_XOPEN_SHM,
-#define _SC_XOPEN_SHM _SC_XOPEN_SHM
-
- _SC_2_CHAR_TERM,
-#define _SC_2_CHAR_TERM _SC_2_CHAR_TERM
- _SC_2_C_VERSION,
-#define _SC_2_C_VERSION _SC_2_C_VERSION
- _SC_2_UPE,
-#define _SC_2_UPE _SC_2_UPE
-
- _SC_XOPEN_XPG2,
-#define _SC_XOPEN_XPG2 _SC_XOPEN_XPG2
- _SC_XOPEN_XPG3,
-#define _SC_XOPEN_XPG3 _SC_XOPEN_XPG3
- _SC_XOPEN_XPG4,
-#define _SC_XOPEN_XPG4 _SC_XOPEN_XPG4
-
- _SC_CHAR_BIT,
-#define _SC_CHAR_BIT _SC_CHAR_BIT
- _SC_CHAR_MAX,
-#define _SC_CHAR_MAX _SC_CHAR_MAX
- _SC_CHAR_MIN,
-#define _SC_CHAR_MIN _SC_CHAR_MIN
- _SC_INT_MAX,
-#define _SC_INT_MAX _SC_INT_MAX
- _SC_INT_MIN,
-#define _SC_INT_MIN _SC_INT_MIN
- _SC_LONG_BIT,
-#define _SC_LONG_BIT _SC_LONG_BIT
- _SC_WORD_BIT,
-#define _SC_WORD_BIT _SC_WORD_BIT
- _SC_MB_LEN_MAX,
-#define _SC_MB_LEN_MAX _SC_MB_LEN_MAX
- _SC_NZERO,
-#define _SC_NZERO _SC_NZERO
- _SC_SSIZE_MAX,
-#define _SC_SSIZE_MAX _SC_SSIZE_MAX
- _SC_SCHAR_MAX,
-#define _SC_SCHAR_MAX _SC_SCHAR_MAX
- _SC_SCHAR_MIN,
-#define _SC_SCHAR_MIN _SC_SCHAR_MIN
- _SC_SHRT_MAX,
-#define _SC_SHRT_MAX _SC_SHRT_MAX
- _SC_SHRT_MIN,
-#define _SC_SHRT_MIN _SC_SHRT_MIN
- _SC_UCHAR_MAX,
-#define _SC_UCHAR_MAX _SC_UCHAR_MAX
- _SC_UINT_MAX,
-#define _SC_UINT_MAX _SC_UINT_MAX
- _SC_ULONG_MAX,
-#define _SC_ULONG_MAX _SC_ULONG_MAX
- _SC_USHRT_MAX,
-#define _SC_USHRT_MAX _SC_USHRT_MAX
-
- _SC_NL_ARGMAX,
-#define _SC_NL_ARGMAX _SC_NL_ARGMAX
- _SC_NL_LANGMAX,
-#define _SC_NL_LANGMAX _SC_NL_LANGMAX
- _SC_NL_MSGMAX,
-#define _SC_NL_MSGMAX _SC_NL_MSGMAX
- _SC_NL_NMAX,
-#define _SC_NL_NMAX _SC_NL_NMAX
- _SC_NL_SETMAX,
-#define _SC_NL_SETMAX _SC_NL_SETMAX
- _SC_NL_TEXTMAX,
-#define _SC_NL_TEXTMAX _SC_NL_TEXTMAX
-
- _SC_XBS5_ILP32_OFF32,
-#define _SC_XBS5_ILP32_OFF32 _SC_XBS5_ILP32_OFF32
- _SC_XBS5_ILP32_OFFBIG,
-#define _SC_XBS5_ILP32_OFFBIG _SC_XBS5_ILP32_OFFBIG
- _SC_XBS5_LP64_OFF64,
-#define _SC_XBS5_LP64_OFF64 _SC_XBS5_LP64_OFF64
- _SC_XBS5_LPBIG_OFFBIG,
-#define _SC_XBS5_LPBIG_OFFBIG _SC_XBS5_LPBIG_OFFBIG
-
- _SC_XOPEN_LEGACY,
-#define _SC_XOPEN_LEGACY _SC_XOPEN_LEGACY
- _SC_XOPEN_REALTIME,
-#define _SC_XOPEN_REALTIME _SC_XOPEN_REALTIME
- _SC_XOPEN_REALTIME_THREADS,
-#define _SC_XOPEN_REALTIME_THREADS _SC_XOPEN_REALTIME_THREADS
-
- _SC_ADVISORY_INFO,
-#define _SC_ADVISORY_INFO _SC_ADVISORY_INFO
- _SC_BARRIERS,
-#define _SC_BARRIERS _SC_BARRIERS
- _SC_BASE,
-#define _SC_BASE _SC_BASE
- _SC_C_LANG_SUPPORT,
-#define _SC_C_LANG_SUPPORT _SC_C_LANG_SUPPORT
- _SC_C_LANG_SUPPORT_R,
-#define _SC_C_LANG_SUPPORT_R _SC_C_LANG_SUPPORT_R
- _SC_CLOCK_SELECTION,
-#define _SC_CLOCK_SELECTION _SC_CLOCK_SELECTION
- _SC_CPUTIME,
-#define _SC_CPUTIME _SC_CPUTIME
- _SC_THREAD_CPUTIME,
-#define _SC_THREAD_CPUTIME _SC_THREAD_CPUTIME
- _SC_DEVICE_IO,
-#define _SC_DEVICE_IO _SC_DEVICE_IO
- _SC_DEVICE_SPECIFIC,
-#define _SC_DEVICE_SPECIFIC _SC_DEVICE_SPECIFIC
- _SC_DEVICE_SPECIFIC_R,
-#define _SC_DEVICE_SPECIFIC_R _SC_DEVICE_SPECIFIC_R
- _SC_FD_MGMT,
-#define _SC_FD_MGMT _SC_FD_MGMT
- _SC_FIFO,
-#define _SC_FIFO _SC_FIFO
- _SC_PIPE,
-#define _SC_PIPE _SC_PIPE
- _SC_FILE_ATTRIBUTES,
-#define _SC_FILE_ATTRIBUTES _SC_FILE_ATTRIBUTES
- _SC_FILE_LOCKING,
-#define _SC_FILE_LOCKING _SC_FILE_LOCKING
- _SC_FILE_SYSTEM,
-#define _SC_FILE_SYSTEM _SC_FILE_SYSTEM
- _SC_MONOTONIC_CLOCK,
-#define _SC_MONOTONIC_CLOCK _SC_MONOTONIC_CLOCK
- _SC_MULTI_PROCESS,
-#define _SC_MULTI_PROCESS _SC_MULTI_PROCESS
- _SC_SINGLE_PROCESS,
-#define _SC_SINGLE_PROCESS _SC_SINGLE_PROCESS
- _SC_NETWORKING,
-#define _SC_NETWORKING _SC_NETWORKING
- _SC_READER_WRITER_LOCKS,
-#define _SC_READER_WRITER_LOCKS _SC_READER_WRITER_LOCKS
- _SC_SPIN_LOCKS,
-#define _SC_SPIN_LOCKS _SC_SPIN_LOCKS
- _SC_REGEXP,
-#define _SC_REGEXP _SC_REGEXP
- _SC_REGEX_VERSION,
-#define _SC_REGEX_VERSION _SC_REGEX_VERSION
- _SC_SHELL,
-#define _SC_SHELL _SC_SHELL
- _SC_SIGNALS,
-#define _SC_SIGNALS _SC_SIGNALS
- _SC_SPAWN,
-#define _SC_SPAWN _SC_SPAWN
- _SC_SPORADIC_SERVER,
-#define _SC_SPORADIC_SERVER _SC_SPORADIC_SERVER
- _SC_THREAD_SPORADIC_SERVER,
-#define _SC_THREAD_SPORADIC_SERVER _SC_THREAD_SPORADIC_SERVER
- _SC_SYSTEM_DATABASE,
-#define _SC_SYSTEM_DATABASE _SC_SYSTEM_DATABASE
- _SC_SYSTEM_DATABASE_R,
-#define _SC_SYSTEM_DATABASE_R _SC_SYSTEM_DATABASE_R
- _SC_TIMEOUTS,
-#define _SC_TIMEOUTS _SC_TIMEOUTS
- _SC_TYPED_MEMORY_OBJECTS,
-#define _SC_TYPED_MEMORY_OBJECTS _SC_TYPED_MEMORY_OBJECTS
- _SC_USER_GROUPS,
-#define _SC_USER_GROUPS _SC_USER_GROUPS
- _SC_USER_GROUPS_R,
-#define _SC_USER_GROUPS_R _SC_USER_GROUPS_R
- _SC_2_PBS,
-#define _SC_2_PBS _SC_2_PBS
- _SC_2_PBS_ACCOUNTING,
-#define _SC_2_PBS_ACCOUNTING _SC_2_PBS_ACCOUNTING
- _SC_2_PBS_LOCATE,
-#define _SC_2_PBS_LOCATE _SC_2_PBS_LOCATE
- _SC_2_PBS_MESSAGE,
-#define _SC_2_PBS_MESSAGE _SC_2_PBS_MESSAGE
- _SC_2_PBS_TRACK,
-#define _SC_2_PBS_TRACK _SC_2_PBS_TRACK
- _SC_SYMLOOP_MAX,
-#define _SC_SYMLOOP_MAX _SC_SYMLOOP_MAX
- _SC_STREAMS,
-#define _SC_STREAMS _SC_STREAMS
- _SC_2_PBS_CHECKPOINT,
-#define _SC_2_PBS_CHECKPOINT _SC_2_PBS_CHECKPOINT
-
- _SC_V6_ILP32_OFF32,
-#define _SC_V6_ILP32_OFF32 _SC_V6_ILP32_OFF32
- _SC_V6_ILP32_OFFBIG,
-#define _SC_V6_ILP32_OFFBIG _SC_V6_ILP32_OFFBIG
- _SC_V6_LP64_OFF64,
-#define _SC_V6_LP64_OFF64 _SC_V6_LP64_OFF64
- _SC_V6_LPBIG_OFFBIG,
-#define _SC_V6_LPBIG_OFFBIG _SC_V6_LPBIG_OFFBIG
-
- _SC_HOST_NAME_MAX,
-#define _SC_HOST_NAME_MAX _SC_HOST_NAME_MAX
- _SC_TRACE,
-#define _SC_TRACE _SC_TRACE
- _SC_TRACE_EVENT_FILTER,
-#define _SC_TRACE_EVENT_FILTER _SC_TRACE_EVENT_FILTER
- _SC_TRACE_INHERIT,
-#define _SC_TRACE_INHERIT _SC_TRACE_INHERIT
- _SC_TRACE_LOG,
-#define _SC_TRACE_LOG _SC_TRACE_LOG
-
- _SC_LEVEL1_ICACHE_SIZE,
-#define _SC_LEVEL1_ICACHE_SIZE _SC_LEVEL1_ICACHE_SIZE
- _SC_LEVEL1_ICACHE_ASSOC,
-#define _SC_LEVEL1_ICACHE_ASSOC _SC_LEVEL1_ICACHE_ASSOC
- _SC_LEVEL1_ICACHE_LINESIZE,
-#define _SC_LEVEL1_ICACHE_LINESIZE _SC_LEVEL1_ICACHE_LINESIZE
- _SC_LEVEL1_DCACHE_SIZE,
-#define _SC_LEVEL1_DCACHE_SIZE _SC_LEVEL1_DCACHE_SIZE
- _SC_LEVEL1_DCACHE_ASSOC,
-#define _SC_LEVEL1_DCACHE_ASSOC _SC_LEVEL1_DCACHE_ASSOC
- _SC_LEVEL1_DCACHE_LINESIZE,
-#define _SC_LEVEL1_DCACHE_LINESIZE _SC_LEVEL1_DCACHE_LINESIZE
- _SC_LEVEL2_CACHE_SIZE,
-#define _SC_LEVEL2_CACHE_SIZE _SC_LEVEL2_CACHE_SIZE
- _SC_LEVEL2_CACHE_ASSOC,
-#define _SC_LEVEL2_CACHE_ASSOC _SC_LEVEL2_CACHE_ASSOC
- _SC_LEVEL2_CACHE_LINESIZE,
-#define _SC_LEVEL2_CACHE_LINESIZE _SC_LEVEL2_CACHE_LINESIZE
- _SC_LEVEL3_CACHE_SIZE,
-#define _SC_LEVEL3_CACHE_SIZE _SC_LEVEL3_CACHE_SIZE
- _SC_LEVEL3_CACHE_ASSOC,
-#define _SC_LEVEL3_CACHE_ASSOC _SC_LEVEL3_CACHE_ASSOC
- _SC_LEVEL3_CACHE_LINESIZE,
-#define _SC_LEVEL3_CACHE_LINESIZE _SC_LEVEL3_CACHE_LINESIZE
- _SC_LEVEL4_CACHE_SIZE,
-#define _SC_LEVEL4_CACHE_SIZE _SC_LEVEL4_CACHE_SIZE
- _SC_LEVEL4_CACHE_ASSOC,
-#define _SC_LEVEL4_CACHE_ASSOC _SC_LEVEL4_CACHE_ASSOC
- _SC_LEVEL4_CACHE_LINESIZE,
-#define _SC_LEVEL4_CACHE_LINESIZE _SC_LEVEL4_CACHE_LINESIZE
- /* Leave room here, maybe we need a few more cache levels some day. */
-
- _SC_IPV6 = _SC_LEVEL1_ICACHE_SIZE + 50,
-#define _SC_IPV6 _SC_IPV6
- _SC_RAW_SOCKETS,
-#define _SC_RAW_SOCKETS _SC_RAW_SOCKETS
-
- _SC_V7_ILP32_OFF32,
-#define _SC_V7_ILP32_OFF32 _SC_V7_ILP32_OFF32
- _SC_V7_ILP32_OFFBIG,
-#define _SC_V7_ILP32_OFFBIG _SC_V7_ILP32_OFFBIG
- _SC_V7_LP64_OFF64,
-#define _SC_V7_LP64_OFF64 _SC_V7_LP64_OFF64
- _SC_V7_LPBIG_OFFBIG,
-#define _SC_V7_LPBIG_OFFBIG _SC_V7_LPBIG_OFFBIG
-
- _SC_SS_REPL_MAX,
-#define _SC_SS_REPL_MAX _SC_SS_REPL_MAX
-
- _SC_TRACE_EVENT_NAME_MAX,
-#define _SC_TRACE_EVENT_NAME_MAX _SC_TRACE_EVENT_NAME_MAX
- _SC_TRACE_NAME_MAX,
-#define _SC_TRACE_NAME_MAX _SC_TRACE_NAME_MAX
- _SC_TRACE_SYS_MAX,
-#define _SC_TRACE_SYS_MAX _SC_TRACE_SYS_MAX
- _SC_TRACE_USER_EVENT_MAX,
-#define _SC_TRACE_USER_EVENT_MAX _SC_TRACE_USER_EVENT_MAX
-
- _SC_XOPEN_STREAMS,
-#define _SC_XOPEN_STREAMS _SC_XOPEN_STREAMS
-
- _SC_THREAD_ROBUST_PRIO_INHERIT,
-#define _SC_THREAD_ROBUST_PRIO_INHERIT _SC_THREAD_ROBUST_PRIO_INHERIT
- _SC_THREAD_ROBUST_PRIO_PROTECT
-#define _SC_THREAD_ROBUST_PRIO_PROTECT _SC_THREAD_ROBUST_PRIO_PROTECT
- };
-
-/* Values for the NAME argument to `confstr'. */
-enum
- {
- _CS_PATH, /* The default search path. */
-#define _CS_PATH _CS_PATH
-
- _CS_V6_WIDTH_RESTRICTED_ENVS,
-#define _CS_V6_WIDTH_RESTRICTED_ENVS _CS_V6_WIDTH_RESTRICTED_ENVS
-#define _CS_POSIX_V6_WIDTH_RESTRICTED_ENVS _CS_V6_WIDTH_RESTRICTED_ENVS
-
- _CS_GNU_LIBC_VERSION,
-#define _CS_GNU_LIBC_VERSION _CS_GNU_LIBC_VERSION
- _CS_GNU_LIBPTHREAD_VERSION,
-#define _CS_GNU_LIBPTHREAD_VERSION _CS_GNU_LIBPTHREAD_VERSION
-
- _CS_V5_WIDTH_RESTRICTED_ENVS,
-#define _CS_V5_WIDTH_RESTRICTED_ENVS _CS_V5_WIDTH_RESTRICTED_ENVS
-#define _CS_POSIX_V5_WIDTH_RESTRICTED_ENVS _CS_V5_WIDTH_RESTRICTED_ENVS
-
- _CS_V7_WIDTH_RESTRICTED_ENVS,
-#define _CS_V7_WIDTH_RESTRICTED_ENVS _CS_V7_WIDTH_RESTRICTED_ENVS
-#define _CS_POSIX_V7_WIDTH_RESTRICTED_ENVS _CS_V7_WIDTH_RESTRICTED_ENVS
-
- _CS_LFS_CFLAGS = 1000,
-#define _CS_LFS_CFLAGS _CS_LFS_CFLAGS
- _CS_LFS_LDFLAGS,
-#define _CS_LFS_LDFLAGS _CS_LFS_LDFLAGS
- _CS_LFS_LIBS,
-#define _CS_LFS_LIBS _CS_LFS_LIBS
- _CS_LFS_LINTFLAGS,
-#define _CS_LFS_LINTFLAGS _CS_LFS_LINTFLAGS
- _CS_LFS64_CFLAGS,
-#define _CS_LFS64_CFLAGS _CS_LFS64_CFLAGS
- _CS_LFS64_LDFLAGS,
-#define _CS_LFS64_LDFLAGS _CS_LFS64_LDFLAGS
- _CS_LFS64_LIBS,
-#define _CS_LFS64_LIBS _CS_LFS64_LIBS
- _CS_LFS64_LINTFLAGS,
-#define _CS_LFS64_LINTFLAGS _CS_LFS64_LINTFLAGS
-
- _CS_XBS5_ILP32_OFF32_CFLAGS = 1100,
-#define _CS_XBS5_ILP32_OFF32_CFLAGS _CS_XBS5_ILP32_OFF32_CFLAGS
- _CS_XBS5_ILP32_OFF32_LDFLAGS,
-#define _CS_XBS5_ILP32_OFF32_LDFLAGS _CS_XBS5_ILP32_OFF32_LDFLAGS
- _CS_XBS5_ILP32_OFF32_LIBS,
-#define _CS_XBS5_ILP32_OFF32_LIBS _CS_XBS5_ILP32_OFF32_LIBS
- _CS_XBS5_ILP32_OFF32_LINTFLAGS,
-#define _CS_XBS5_ILP32_OFF32_LINTFLAGS _CS_XBS5_ILP32_OFF32_LINTFLAGS
- _CS_XBS5_ILP32_OFFBIG_CFLAGS,
-#define _CS_XBS5_ILP32_OFFBIG_CFLAGS _CS_XBS5_ILP32_OFFBIG_CFLAGS
- _CS_XBS5_ILP32_OFFBIG_LDFLAGS,
-#define _CS_XBS5_ILP32_OFFBIG_LDFLAGS _CS_XBS5_ILP32_OFFBIG_LDFLAGS
- _CS_XBS5_ILP32_OFFBIG_LIBS,
-#define _CS_XBS5_ILP32_OFFBIG_LIBS _CS_XBS5_ILP32_OFFBIG_LIBS
- _CS_XBS5_ILP32_OFFBIG_LINTFLAGS,
-#define _CS_XBS5_ILP32_OFFBIG_LINTFLAGS _CS_XBS5_ILP32_OFFBIG_LINTFLAGS
- _CS_XBS5_LP64_OFF64_CFLAGS,
-#define _CS_XBS5_LP64_OFF64_CFLAGS _CS_XBS5_LP64_OFF64_CFLAGS
- _CS_XBS5_LP64_OFF64_LDFLAGS,
-#define _CS_XBS5_LP64_OFF64_LDFLAGS _CS_XBS5_LP64_OFF64_LDFLAGS
- _CS_XBS5_LP64_OFF64_LIBS,
-#define _CS_XBS5_LP64_OFF64_LIBS _CS_XBS5_LP64_OFF64_LIBS
- _CS_XBS5_LP64_OFF64_LINTFLAGS,
-#define _CS_XBS5_LP64_OFF64_LINTFLAGS _CS_XBS5_LP64_OFF64_LINTFLAGS
- _CS_XBS5_LPBIG_OFFBIG_CFLAGS,
-#define _CS_XBS5_LPBIG_OFFBIG_CFLAGS _CS_XBS5_LPBIG_OFFBIG_CFLAGS
- _CS_XBS5_LPBIG_OFFBIG_LDFLAGS,
-#define _CS_XBS5_LPBIG_OFFBIG_LDFLAGS _CS_XBS5_LPBIG_OFFBIG_LDFLAGS
- _CS_XBS5_LPBIG_OFFBIG_LIBS,
-#define _CS_XBS5_LPBIG_OFFBIG_LIBS _CS_XBS5_LPBIG_OFFBIG_LIBS
- _CS_XBS5_LPBIG_OFFBIG_LINTFLAGS,
-#define _CS_XBS5_LPBIG_OFFBIG_LINTFLAGS _CS_XBS5_LPBIG_OFFBIG_LINTFLAGS
-
- _CS_POSIX_V6_ILP32_OFF32_CFLAGS,
-#define _CS_POSIX_V6_ILP32_OFF32_CFLAGS _CS_POSIX_V6_ILP32_OFF32_CFLAGS
- _CS_POSIX_V6_ILP32_OFF32_LDFLAGS,
-#define _CS_POSIX_V6_ILP32_OFF32_LDFLAGS _CS_POSIX_V6_ILP32_OFF32_LDFLAGS
- _CS_POSIX_V6_ILP32_OFF32_LIBS,
-#define _CS_POSIX_V6_ILP32_OFF32_LIBS _CS_POSIX_V6_ILP32_OFF32_LIBS
- _CS_POSIX_V6_ILP32_OFF32_LINTFLAGS,
-#define _CS_POSIX_V6_ILP32_OFF32_LINTFLAGS _CS_POSIX_V6_ILP32_OFF32_LINTFLAGS
- _CS_POSIX_V6_ILP32_OFFBIG_CFLAGS,
-#define _CS_POSIX_V6_ILP32_OFFBIG_CFLAGS _CS_POSIX_V6_ILP32_OFFBIG_CFLAGS
- _CS_POSIX_V6_ILP32_OFFBIG_LDFLAGS,
-#define _CS_POSIX_V6_ILP32_OFFBIG_LDFLAGS _CS_POSIX_V6_ILP32_OFFBIG_LDFLAGS
- _CS_POSIX_V6_ILP32_OFFBIG_LIBS,
-#define _CS_POSIX_V6_ILP32_OFFBIG_LIBS _CS_POSIX_V6_ILP32_OFFBIG_LIBS
- _CS_POSIX_V6_ILP32_OFFBIG_LINTFLAGS,
-#define _CS_POSIX_V6_ILP32_OFFBIG_LINTFLAGS _CS_POSIX_V6_ILP32_OFFBIG_LINTFLAGS
- _CS_POSIX_V6_LP64_OFF64_CFLAGS,
-#define _CS_POSIX_V6_LP64_OFF64_CFLAGS _CS_POSIX_V6_LP64_OFF64_CFLAGS
- _CS_POSIX_V6_LP64_OFF64_LDFLAGS,
-#define _CS_POSIX_V6_LP64_OFF64_LDFLAGS _CS_POSIX_V6_LP64_OFF64_LDFLAGS
- _CS_POSIX_V6_LP64_OFF64_LIBS,
-#define _CS_POSIX_V6_LP64_OFF64_LIBS _CS_POSIX_V6_LP64_OFF64_LIBS
- _CS_POSIX_V6_LP64_OFF64_LINTFLAGS,
-#define _CS_POSIX_V6_LP64_OFF64_LINTFLAGS _CS_POSIX_V6_LP64_OFF64_LINTFLAGS
- _CS_POSIX_V6_LPBIG_OFFBIG_CFLAGS,
-#define _CS_POSIX_V6_LPBIG_OFFBIG_CFLAGS _CS_POSIX_V6_LPBIG_OFFBIG_CFLAGS
- _CS_POSIX_V6_LPBIG_OFFBIG_LDFLAGS,
-#define _CS_POSIX_V6_LPBIG_OFFBIG_LDFLAGS _CS_POSIX_V6_LPBIG_OFFBIG_LDFLAGS
- _CS_POSIX_V6_LPBIG_OFFBIG_LIBS,
-#define _CS_POSIX_V6_LPBIG_OFFBIG_LIBS _CS_POSIX_V6_LPBIG_OFFBIG_LIBS
- _CS_POSIX_V6_LPBIG_OFFBIG_LINTFLAGS,
-#define _CS_POSIX_V6_LPBIG_OFFBIG_LINTFLAGS _CS_POSIX_V6_LPBIG_OFFBIG_LINTFLAGS
-
- _CS_POSIX_V7_ILP32_OFF32_CFLAGS,
-#define _CS_POSIX_V7_ILP32_OFF32_CFLAGS _CS_POSIX_V7_ILP32_OFF32_CFLAGS
- _CS_POSIX_V7_ILP32_OFF32_LDFLAGS,
-#define _CS_POSIX_V7_ILP32_OFF32_LDFLAGS _CS_POSIX_V7_ILP32_OFF32_LDFLAGS
- _CS_POSIX_V7_ILP32_OFF32_LIBS,
-#define _CS_POSIX_V7_ILP32_OFF32_LIBS _CS_POSIX_V7_ILP32_OFF32_LIBS
- _CS_POSIX_V7_ILP32_OFF32_LINTFLAGS,
-#define _CS_POSIX_V7_ILP32_OFF32_LINTFLAGS _CS_POSIX_V7_ILP32_OFF32_LINTFLAGS
- _CS_POSIX_V7_ILP32_OFFBIG_CFLAGS,
-#define _CS_POSIX_V7_ILP32_OFFBIG_CFLAGS _CS_POSIX_V7_ILP32_OFFBIG_CFLAGS
- _CS_POSIX_V7_ILP32_OFFBIG_LDFLAGS,
-#define _CS_POSIX_V7_ILP32_OFFBIG_LDFLAGS _CS_POSIX_V7_ILP32_OFFBIG_LDFLAGS
- _CS_POSIX_V7_ILP32_OFFBIG_LIBS,
-#define _CS_POSIX_V7_ILP32_OFFBIG_LIBS _CS_POSIX_V7_ILP32_OFFBIG_LIBS
- _CS_POSIX_V7_ILP32_OFFBIG_LINTFLAGS,
-#define _CS_POSIX_V7_ILP32_OFFBIG_LINTFLAGS _CS_POSIX_V7_ILP32_OFFBIG_LINTFLAGS
- _CS_POSIX_V7_LP64_OFF64_CFLAGS,
-#define _CS_POSIX_V7_LP64_OFF64_CFLAGS _CS_POSIX_V7_LP64_OFF64_CFLAGS
- _CS_POSIX_V7_LP64_OFF64_LDFLAGS,
-#define _CS_POSIX_V7_LP64_OFF64_LDFLAGS _CS_POSIX_V7_LP64_OFF64_LDFLAGS
- _CS_POSIX_V7_LP64_OFF64_LIBS,
-#define _CS_POSIX_V7_LP64_OFF64_LIBS _CS_POSIX_V7_LP64_OFF64_LIBS
- _CS_POSIX_V7_LP64_OFF64_LINTFLAGS,
-#define _CS_POSIX_V7_LP64_OFF64_LINTFLAGS _CS_POSIX_V7_LP64_OFF64_LINTFLAGS
- _CS_POSIX_V7_LPBIG_OFFBIG_CFLAGS,
-#define _CS_POSIX_V7_LPBIG_OFFBIG_CFLAGS _CS_POSIX_V7_LPBIG_OFFBIG_CFLAGS
- _CS_POSIX_V7_LPBIG_OFFBIG_LDFLAGS,
-#define _CS_POSIX_V7_LPBIG_OFFBIG_LDFLAGS _CS_POSIX_V7_LPBIG_OFFBIG_LDFLAGS
- _CS_POSIX_V7_LPBIG_OFFBIG_LIBS,
-#define _CS_POSIX_V7_LPBIG_OFFBIG_LIBS _CS_POSIX_V7_LPBIG_OFFBIG_LIBS
- _CS_POSIX_V7_LPBIG_OFFBIG_LINTFLAGS,
-#define _CS_POSIX_V7_LPBIG_OFFBIG_LINTFLAGS _CS_POSIX_V7_LPBIG_OFFBIG_LINTFLAGS
-
- _CS_V6_ENV,
-#define _CS_V6_ENV _CS_V6_ENV
- _CS_V7_ENV
-#define _CS_V7_ENV _CS_V7_ENV
- };
-
-#endif /* defined(_CONFNAME_H) */
diff --git a/srcpkgs/lshw/patches/musl-confname_h.patch b/srcpkgs/lshw/patches/musl-confname_h.patch
deleted file mode 100644
index 3d4b1f00267..00000000000
--- a/srcpkgs/lshw/patches/musl-confname_h.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-The musl libc does not define the _sysconf(2) constant _SC_LONG_BIT,
-thus include a local copy of GNU libc's /usr/include/bits/confname.h
-
---- src/core/abi.cc 2015-10-14 10:09:57.131324977 +0200
-+++ src/core/abi.cc 2015-10-14 10:15:29.040299081 +0200
-@@ -8,6 +8,9 @@
- #include "config.h"
- #include "abi.h"
- #include "osutils.h"
-+#if !defined(__GLIBC__)
-+#include "confname.h"
-+#endif
- #include <unistd.h>
- #include <stdlib.h>
- #include <dirent.h>
diff --git a/srcpkgs/lshw/patches/musl-long_bits.patch b/srcpkgs/lshw/patches/musl-long_bits.patch
new file mode 100644
index 00000000000..e67df9ddc6c
--- /dev/null
+++ b/srcpkgs/lshw/patches/musl-long_bits.patch
@@ -0,0 +1,20 @@
+sysconf(LONG_BIT) isn't correct usage of sysconf(3).
+
+musl doesn't define _SC_LONG_BIT, so just use LONG_BIT directly. There's really
+no reason to use sysconf(3) here, word size isn't a runtime property.
+
+diff --git src/core/abi.cc src/core/abi.cc
+index adff7b5..76c664c 100644
+--- src/core/abi.cc
++++ src/core/abi.cc
+@@ -20,9 +20,7 @@ __ID("@(#) $Id: mem.cc 1352 2006-05-27 23:54:13Z ezix $");
+ bool scan_abi(hwNode & system)
+ {
+ // are we compiled as 32- or 64-bit process ?
+- long sc = sysconf(LONG_BIT);
+- if(sc==-1) sc = sysconf(_SC_LONG_BIT);
+- if(sc!=-1) system.setWidth(sc);
++ system.setWidth(LONG_BIT);
+
+ pushd(PROC_SYS);
+
diff --git a/srcpkgs/lshw/patches/musl-path_max.patch b/srcpkgs/lshw/patches/musl-path_max.patch
deleted file mode 100644
index e10dd0c6df0..00000000000
--- a/srcpkgs/lshw/patches/musl-path_max.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Need to include limits.h for the definition of PATH_MAX.
-
---- src/core/cpufreq.cc 2015-10-14 10:07:06.646338278 +0200
-+++ src/core/cpufreq.cc 2015-10-14 10:08:09.092333406 +0200
-@@ -10,6 +10,7 @@
- #include "version.h"
- #include "hw.h"
- #include "osutils.h"
-+#include <limits.h>
- #include <string.h>
- #include <sys/types.h>
- #include <sys/stat.h>
diff --git a/srcpkgs/lshw/template b/srcpkgs/lshw/template
index c6d0130a766..6ba1bb44a95 100644
--- a/srcpkgs/lshw/template
+++ b/srcpkgs/lshw/template
@@ -1,7 +1,7 @@
# Template file for 'lshw'
pkgname=lshw
version=B.02.19.2
-revision=1
+revision=2
build_style=gnu-makefile
make_build_args="VERSION=${version}"
make_build_target="all gui"
@@ -18,11 +18,6 @@ distfiles="https://ezix.org/software/files/lshw-${version}.tar.gz"
checksum=9bb347ac87142339a366a1759ac845e3dbb337ec000aa1b99b50ac6758a80f80
post_patch() {
- case "$XBPS_TARGET_MACHINE" in
- *-musl)
- cp -p ${FILESDIR}/confname.h ${wrksrc}/src/core
- ;;
- esac
vsed -i src/Makefile src/gui/Makefile \
-e 's,CXXFLAGS=,CXXFLAGS += ,g'
}
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PR PATCH] [Merged]: lshw: clean up musl patches.
2021-01-11 14:04 [PR PATCH] lshw: clean up musl patches ericonr
@ 2021-01-12 3:04 ` ericonr
0 siblings, 0 replies; 2+ messages in thread
From: ericonr @ 2021-01-12 3:04 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 574 bytes --]
There's a merged pull request on the void-packages repository
lshw: clean up musl patches.
https://github.com/void-linux/void-packages/pull/27826
Description:
musl-path_max was no longer necessary, and musl-confname_h was kind of
helping them do the wrong thing. They should just be using the value of
LONG_BIT instead of trying to pass it to sysconf, so the usage was wrong
on glibc and musl. _SC_LONG_BIT is a glibc extension and shouldn't be at
all needed.
Since this does change behavior (sysconf(LONG_BIT) could return
arbitrary values), revbump the package.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-01-12 3:04 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-01-11 14:04 [PR PATCH] lshw: clean up musl patches ericonr
2021-01-12 3:04 ` [PR PATCH] [Merged]: " ericonr
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).