tree-wide: remove pthread/rt patches and workarounds
Commit af18f1dac0
("scripts: start_build: create libpthread and
librt as well") added helper libs so that packages that try to find
these libs can do so.
%ci:no-build
This commit is contained in:
parent
d5d337ddb8
commit
986babfda7
|
@ -1,27 +0,0 @@
|
|||
--- ./configure 2016-08-02 22:44:23.000000000 +0530
|
||||
+++ ../configure 2016-12-03 23:06:46.641370754 +0530
|
||||
@@ -7123,7 +7123,7 @@
|
||||
LDFLAGS="$LDFLAGS $ALSA_LIBS"
|
||||
fi
|
||||
|
||||
-ALSA_LIBS="$ALSA_LIBS -lasound -lm -ldl -lpthread"
|
||||
+ALSA_LIBS="$ALSA_LIBS -lasound -lm -ldl"
|
||||
LIBS="$ALSA_LIBS $LIBS"
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ALSA_LIBS" >&5
|
||||
$as_echo "$ALSA_LIBS" >&6; }
|
||||
@@ -7741,7 +7741,6 @@
|
||||
$as_echo_n "(cached) " >&6
|
||||
else
|
||||
ac_check_lib_save_LIBS=$LIBS
|
||||
-LIBS="-lpthread $LIBS"
|
||||
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
||||
/* end confdefs.h. */
|
||||
|
||||
@@ -7776,7 +7775,6 @@
|
||||
#define HAVE_LIBPTHREAD 1
|
||||
_ACEOF
|
||||
|
||||
- LIBS="-lpthread $LIBS"
|
||||
|
||||
else
|
||||
as_fn_error $? "Error: need PTHREAD library" "$LINENO" 5
|
|
@ -1,7 +0,0 @@
|
|||
--- a/src/Makefile 2015-12-30 08:23:13.000000000 +0000
|
||||
+++ b/src/Makefile 2018-01-11 19:31:06.217971593 +0000
|
||||
@@ -7,1 +7,1 @@
|
||||
-LINKFLAGS = -lpthread -lpcap $(LDFLAGS)
|
||||
+LINKFLAGS = -lpcap $(LDFLAGS)
|
||||
#@@ -8,1 +8,1 @@
|
||||
#+PREFIX ?= /usr/local
|
|
@ -1,5 +0,0 @@
|
|||
--- a/src/attacks/Makefile 2015-12-30 08:23:13.000000000 +0000
|
||||
+++ b/src/attacks/Makefile 2018-01-11 19:31:06.217971593 +0000
|
||||
@@ -2,1 +2,1 @@
|
||||
-LINKFLAGS = -lpthread $(LDFLAGS)
|
||||
+LINKFLAGS = $(LDFLAGS)
|
|
@ -1,13 +1,7 @@
|
|||
diff -uNr v-0.2.2/Makefile v-0.2.2.mod/Makefile
|
||||
--- v-0.2.2/Makefile 2021-01-22 09:39:44.000000000 +0000
|
||||
+++ v-0.2.2.mod/Makefile 2021-05-06 11:58:25.054252805 +0000
|
||||
@@ -82,23 +82,16 @@
|
||||
$(V) self
|
||||
endif
|
||||
else
|
||||
- $(CC) $(CFLAGS) -g -std=gnu99 -w -o $(V) $(VC)/$(VCFILE) -lm -lpthread $(LDFLAGS)
|
||||
+ $(CC) $(CFLAGS) -g -std=gnu99 -w -o $(V) $(VC)/$(VCFILE) -lm $(LDFLAGS)
|
||||
ifdef ANDROID
|
||||
@@ -82,18 +82,11 @@
|
||||
chmod 755 v
|
||||
endif
|
||||
|
||||
|
|
|
@ -1,24 +0,0 @@
|
|||
diff -ru a/C/7zip_gcc_c.mak b/C/7zip_gcc_c.mak
|
||||
--- a/C/7zip_gcc_c.mak 2022-07-15 10:00:00.000000000 +0200
|
||||
+++ b/C/7zip_gcc_c.mak 2022-11-10 22:05:33.101451700 +0100
|
||||
@@ -108,7 +108,7 @@
|
||||
|
||||
# LOCAL_LIBS=-lpthread
|
||||
# LOCAL_LIBS_DLL=$(LOCAL_LIBS) -ldl
|
||||
-LIB2 = -lpthread -ldl
|
||||
+LIB2 = -ldl
|
||||
|
||||
DEL_OBJ_EXE = -$(RM) $(PROGPATH) $(PROGPATH_STATIC) $(OBJS)
|
||||
|
||||
diff -ru a/CPP/7zip/7zip_gcc.mak b/CPP/7zip/7zip_gcc.mak
|
||||
--- a/CPP/7zip/7zip_gcc.mak 2022-07-15 14:00:00.000000000 +0200
|
||||
+++ b/CPP/7zip/7zip_gcc.mak 2022-11-10 22:05:39.648159700 +0100
|
||||
@@ -131,7 +131,7 @@
|
||||
|
||||
# LOCAL_LIBS=-lpthread
|
||||
# LOCAL_LIBS_DLL=$(LOCAL_LIBS) -ldl
|
||||
-LIB2 = -lpthread -ldl
|
||||
+LIB2 = -ldl
|
||||
|
||||
|
||||
endif
|
|
@ -1,17 +1,5 @@
|
|||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -63,9 +63,9 @@
|
||||
|
||||
AC_CHECK_HEADERS([pthread.h],
|
||||
AC_CHECK_LIB(pthread, pthread_create, LIBS="$LIBS -lpthread",
|
||||
- AC_MSG_ERROR([pthread.h found but there is no pthread library to make use of])
|
||||
+ AC_MSG_NOTICE([pthread.h found but there is no pthread library to make use of])
|
||||
),
|
||||
- AC_MSG_ERROR([no pthread.h header header file found])
|
||||
+ AC_MSG_NOTICE([no pthread.h header header file found])
|
||||
)
|
||||
|
||||
dnl ######################
|
||||
@@ -260,7 +260,7 @@
|
||||
AC_CHECK_LIB(iniparser,iniparser_load, have_iniparser=yes, have_iniparser=no)
|
||||
if [[ $have_iniparser = "yes" ]] ; then
|
||||
|
|
|
@ -72,12 +72,10 @@
|
|||
#Windows specific libraries and linker flags
|
||||
if(WIN32)
|
||||
include_directories ("${PROJECT_SOURCE_DIR}/thirdparty/win_spec_incld/")
|
||||
@@ -153,9 +90,33 @@
|
||||
endif (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
|
||||
@@ -153,8 +90,32 @@
|
||||
|
||||
|
||||
-set (EXTRA_LIBS ${EXTRA_LIBS} -lm -lpthread -ldl)
|
||||
+set (EXTRA_LIBS ${EXTRA_LIBS} -lm -ldl)
|
||||
set (EXTRA_LIBS ${EXTRA_LIBS} -lm -lpthread -ldl)
|
||||
+
|
||||
+find_package (PkgConfig REQUIRED)
|
||||
|
||||
|
|
|
@ -5,7 +5,7 @@
|
|||
|
||||
# Libraries and linker flags for edbrowse.
|
||||
-LDFLAGS = $(STRIP) $(LINKER_LIBS) -lpthread -lm -lssl -lcrypto
|
||||
+LDFLAGS = $(STRIP) $(LINKER_LIBS) -landroid-glob -lm -lssl -lcrypto
|
||||
+LDFLAGS = $(STRIP) $(LINKER_LIBS) -lpthread -landroid-glob -lm -lssl -lcrypto
|
||||
|
||||
# LDFLAGS for quickjs loading.
|
||||
-QUICKJS_LDFLAGS = $(QUICKJS_DIR)/libquickjs.a -ldl
|
||||
|
|
|
@ -59,7 +59,7 @@
|
|||
libefence.so.0.0: $(OBJECTS)
|
||||
$(CC) -shared -Wl,-soname,libefence.so.0 -o libefence.so.0.0 \
|
||||
- $(CFLAGS) $(OBJECTS) -lpthread -lc
|
||||
+ $(CFLAGS) $(OBJECTS) $(LDFLAGS) -lc
|
||||
+ $(CFLAGS) $(OBJECTS) $(LDFLAGS) -lpthread -lc
|
||||
|
||||
tstheap: libefence.a tstheap.o
|
||||
- rm -f tstheap
|
||||
|
|
|
@ -1,24 +0,0 @@
|
|||
diff -u -r ../espeak-ng-1.49.1/Makefile.am ./Makefile.am
|
||||
--- ../espeak-ng-1.49.1/Makefile.am 2017-01-21 21:57:13.000000000 +0100
|
||||
+++ ./Makefile.am 2017-02-01 00:30:07.810286033 +0100
|
||||
@@ -121,7 +121,7 @@
|
||||
|
||||
lib_LTLIBRARIES += src/libespeak-ng.la
|
||||
|
||||
-src_libespeak_ng_la_LDFLAGS = -version-info $(SHARED_VERSION) -lpthread -lm \
|
||||
+src_libespeak_ng_la_LDFLAGS = -version-info $(SHARED_VERSION) -lm \
|
||||
${PCAUDIOLIB_LIBS}
|
||||
|
||||
src_libespeak_ng_la_CFLAGS = -Isrc/include -Isrc/include/compat \
|
||||
diff -u -r ../espeak-ng-1.49.1/Makefile.in ./Makefile.in
|
||||
--- ../espeak-ng-1.49.1/Makefile.in 2017-01-21 21:57:17.000000000 +0100
|
||||
+++ ./Makefile.in 2017-02-01 00:30:24.202085646 +0100
|
||||
@@ -472,7 +472,7 @@
|
||||
src/include/espeak-ng/espeak_ng.h \
|
||||
src/include/espeak-ng/speak_lib.h
|
||||
|
||||
-src_libespeak_ng_la_LDFLAGS = -version-info $(SHARED_VERSION) -lpthread -lm \
|
||||
+src_libespeak_ng_la_LDFLAGS = -version-info $(SHARED_VERSION) -lm \
|
||||
${PCAUDIOLIB_LIBS}
|
||||
|
||||
src_libespeak_ng_la_CFLAGS = -Isrc/include -Isrc/include/compat -fPIC \
|
|
@ -31,33 +31,6 @@ diff -uNr fossil-2.11/auto.def fossil-2.11.mod/auto.def
|
|||
|
||||
}
|
||||
|
||||
@@ -275,7 +241,7 @@
|
||||
cc-check-function-in-lib iconv iconv
|
||||
|
||||
# Helper for OpenSSL checking
|
||||
-proc check-for-openssl {msg {cflags {}} {libs {-lssl -lcrypto -lpthread}}} {
|
||||
+proc check-for-openssl {msg {cflags {}} {libs {-lssl -lcrypto}}} {
|
||||
msg-checking "Checking for $msg..."
|
||||
set rc 0
|
||||
if {[is_mingw]} {
|
||||
@@ -353,7 +319,7 @@
|
||||
set msg "ssl in $ssldir"
|
||||
set cflags "-I$ssldir/include"
|
||||
set ldflags "-L$ssldir"
|
||||
- set ssllibs "$ssldir/libssl.a $ssldir/libcrypto.a -lpthread"
|
||||
+ set ssllibs "$ssldir/libssl.a $ssldir/libcrypto.a"
|
||||
set found [check-for-openssl "ssl in source tree" "$cflags $ldflags" $ssllibs]
|
||||
} else {
|
||||
if {$ssldirs in {auto ""}} {
|
||||
@@ -501,7 +499,7 @@
|
||||
# e.g. --with-sqlite=/usr/local. Try $sq3path/lib/libsqlite3*
|
||||
# and $sq3path/include/sqlite3.h
|
||||
define-append CFLAGS_INCLUDE -I$sq3path/include
|
||||
- define-append EXTRA_LDFLAGS -L$sq3path/lib -lsqlite3 -lpthread
|
||||
+ define-append EXTRA_LDFLAGS -L$sq3path/lib -lsqlite3
|
||||
# ^^^ additional -lXXX flags are conservative estimates
|
||||
msg-result "Using -lsqlite3 from $sq3path"
|
||||
} else {
|
||||
@@ -479,23 +445,6 @@
|
||||
cc-with [list -cflags $cflags -libs $libs] {
|
||||
if {$tclstubs} {
|
||||
|
|
|
@ -39,12 +39,8 @@ diff -uNr gatling-0.13/GNUmakefile gatling-0.13.mod/GNUmakefile
|
|||
endif
|
||||
endif
|
||||
|
||||
@@ -81,10 +78,10 @@
|
||||
CC:=$(DIET) $(CC)
|
||||
|
||||
pthreadbench: pthreadbench.o
|
||||
- $(CC) $< -o $@ -I. $(CFLAGS) $(LDFLAGS) $(LDLIBS) -lpthread
|
||||
+ $(CC) $< -o $@ -I. $(CFLAGS) $(LDFLAGS) $(LDLIBS)
|
||||
@@ -81,7 +78,7 @@
|
||||
$(CC) $< -o $@ -I. $(CFLAGS) $(LDFLAGS) $(LDLIBS)
|
||||
|
||||
forksbench: forkbench.o
|
||||
- $(CC) -static -o $@ forkbench.o $(LDFLAGS) $(LDLIBS)
|
||||
|
|
|
@ -9,12 +9,3 @@
|
|||
status=$?
|
||||
cp config.log "$olddir/configaux.log"
|
||||
if test $status -eq 0 ; then
|
||||
@@ -6648,7 +6648,7 @@
|
||||
if test "x$ac_cv_lib_pthread_pthread_create" = xyes; then :
|
||||
|
||||
SYNC=posync;
|
||||
- PTHREAD_LIBS="-lpthread"
|
||||
+ PTHREAD_LIBS=""
|
||||
|
||||
fi
|
||||
|
||||
|
|
|
@ -1,15 +1,6 @@
|
|||
diff -uNr gmic-2.9.7/src/Makefile gmic-2.9.7.mod/src/Makefile
|
||||
--- gmic-2.9.7/src/Makefile 2021-04-07 14:55:16.000000000 +0000
|
||||
+++ gmic-2.9.7.mod/src/Makefile 2021-05-04 16:08:14.407443228 +0000
|
||||
@@ -207,7 +207,7 @@
|
||||
# Enable multi-threading support.
|
||||
PARALLEL_CFLAGS = -Dgmic_is_parallel
|
||||
ifneq ($(OS),Windows)
|
||||
-PARALLEL_LIBS = -lpthread
|
||||
+#PARALLEL_LIBS = -lpthread
|
||||
endif
|
||||
|
||||
# Enable parallelization in CImg, using OpenMP.
|
||||
@@ -352,8 +352,8 @@
|
||||
GMIC_CLI_CFLAGS = $(MANDATORY_CFLAGS) $(ABORT_CFLAGS) $(PARALLEL_CFLAGS) $(FFTW_CFLAGS) $(CURL_CFLAGS) $(PNG_CFLAGS) $(JPEG_CFLAGS) $(TIFF_CFLAGS)
|
||||
GMIC_CLI_LIBS = $(MANDATORY_LIBS) $(PARALLEL_LIBS) $(FFTW_LIBS) $(CURL_LIBS) $(PNG_LIBS) $(JPEG_LIBS) $(TIFF_LIBS)
|
||||
|
|
|
@ -1,8 +0,0 @@
|
|||
--- a/src/zonemaster/Makefile.am
|
||||
+++ b/src/zonemaster/Makefile.am
|
||||
@@ -29,4 +29,4 @@
|
||||
$(top_builddir)/src/namestore/libgnunetnamestore.la \
|
||||
$(top_builddir)/src/namecache/libgnunetnamecache.la \
|
||||
$(GN_LIBINTL) \
|
||||
- -lpthread
|
||||
+ -lc
|
|
@ -1,60 +0,0 @@
|
|||
diff -uNr goaccess-1.3/configure goaccess-1.3.mod/configure
|
||||
--- goaccess-1.3/configure 2018-11-23 07:35:57.000000000 +0200
|
||||
+++ goaccess-1.3.mod/configure 2019-02-01 01:24:41.379926604 +0200
|
||||
@@ -6431,56 +6431,6 @@
|
||||
fi
|
||||
|
||||
|
||||
-# pthread
|
||||
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_create in -lpthread" >&5
|
||||
-$as_echo_n "checking for pthread_create in -lpthread... " >&6; }
|
||||
-if ${ac_cv_lib_pthread_pthread_create+:} false; then :
|
||||
- $as_echo_n "(cached) " >&6
|
||||
-else
|
||||
- ac_check_lib_save_LIBS=$LIBS
|
||||
-LIBS="-lpthread $LIBS"
|
||||
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
||||
-/* end confdefs.h. */
|
||||
-
|
||||
-/* Override any GCC internal prototype to avoid an error.
|
||||
- Use char because int might match the return type of a GCC
|
||||
- builtin and then its argument prototype would still apply. */
|
||||
-#ifdef __cplusplus
|
||||
-extern "C"
|
||||
-#endif
|
||||
-char pthread_create ();
|
||||
-int
|
||||
-main ()
|
||||
-{
|
||||
-return pthread_create ();
|
||||
- ;
|
||||
- return 0;
|
||||
-}
|
||||
-_ACEOF
|
||||
-if ac_fn_c_try_link "$LINENO"; then :
|
||||
- ac_cv_lib_pthread_pthread_create=yes
|
||||
-else
|
||||
- ac_cv_lib_pthread_pthread_create=no
|
||||
-fi
|
||||
-rm -f core conftest.err conftest.$ac_objext \
|
||||
- conftest$ac_exeext conftest.$ac_ext
|
||||
-LIBS=$ac_check_lib_save_LIBS
|
||||
-fi
|
||||
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pthread_pthread_create" >&5
|
||||
-$as_echo "$ac_cv_lib_pthread_pthread_create" >&6; }
|
||||
-if test "x$ac_cv_lib_pthread_pthread_create" = xyes; then :
|
||||
- cat >>confdefs.h <<_ACEOF
|
||||
-#define HAVE_LIBPTHREAD 1
|
||||
-_ACEOF
|
||||
-
|
||||
- LIBS="-lpthread $LIBS"
|
||||
-
|
||||
-else
|
||||
- as_fn_error $? "pthread is missing" "$LINENO" 5
|
||||
-fi
|
||||
-
|
||||
-CFLAGS="$CFLAGS -pthread"
|
||||
-
|
||||
# DEBUG
|
||||
# Check whether --enable-debug was given.
|
||||
if test "${enable_debug+set}" = set; then :
|
|
@ -1,12 +0,0 @@
|
|||
diff -uNr libburn-1.5.0/configure libburn-1.5.0.mod/configure
|
||||
--- libburn-1.5.0/configure 2018-09-15 14:55:33.000000000 +0300
|
||||
+++ libburn-1.5.0.mod/configure 2019-07-03 22:55:41.489672172 +0300
|
||||
@@ -12269,7 +12269,7 @@
|
||||
done
|
||||
|
||||
|
||||
-THREAD_LIBS=-lpthread
|
||||
+THREAD_LIBS=
|
||||
|
||||
|
||||
|
|
@ -1,29 +0,0 @@
|
|||
--- elfutils-0.187/debuginfod/Makefile.am 2022-04-25 21:56:39.000000000 +0100
|
||||
+++ elfutils-0.187.mod/debuginfod/Makefile.am 2022-07-22 16:59:13.856181000 +0100
|
||||
@@ -42,7 +42,7 @@
|
||||
|
||||
if BUILD_STATIC
|
||||
libasm = ../libasm/libasm.a
|
||||
-libdw = ../libdw/libdw.a -lz $(zip_LIBS) $(libelf) $(libebl) -ldl -lpthread
|
||||
+libdw = ../libdw/libdw.a -lz $(zip_LIBS) $(libelf) $(libebl) -ldl
|
||||
libelf = ../libelf/libelf.a -lz
|
||||
if DUMMY_LIBDEBUGINFOD
|
||||
libdebuginfod = ./libdebuginfod.a
|
||||
@@ -70,7 +70,7 @@
|
||||
endif
|
||||
|
||||
debuginfod_SOURCES = debuginfod.cxx
|
||||
-debuginfod_LDADD = $(libdw) $(libelf) $(libeu) $(libdebuginfod) $(argp_LDADD) $(fts_LIBS) $(libmicrohttpd_LIBS) $(sqlite3_LIBS) $(libarchive_LIBS) -lpthread -ldl
|
||||
+debuginfod_LDADD = $(libdw) $(libelf) $(libeu) $(libdebuginfod) $(argp_LDADD) $(fts_LIBS) $(libmicrohttpd_LIBS) $(sqlite3_LIBS) $(libarchive_LIBS) -ldl
|
||||
|
||||
debuginfod_find_SOURCES = debuginfod-find.c
|
||||
debuginfod_find_LDADD = $(libdw) $(libelf) $(libeu) $(libdebuginfod) $(argp_LDADD) $(fts_LIBS)
|
||||
@@ -97,7 +97,7 @@
|
||||
if DUMMY_LIBDEBUGINFOD
|
||||
libdebuginfod_so_LDLIBS =
|
||||
else
|
||||
-libdebuginfod_so_LDLIBS = -lpthread $(libcurl_LIBS) $(fts_LIBS) $(libelf)
|
||||
+libdebuginfod_so_LDLIBS = $(libcurl_LIBS) $(fts_LIBS) $(libelf)
|
||||
endif
|
||||
$(LIBDEBUGINFOD_SONAME): $(srcdir)/libdebuginfod.map $(libdebuginfod_so_LIBS)
|
||||
$(AM_V_CCLD)$(LINK) $(dso_LDFLAGS) -o $@ \
|
|
@ -12,12 +12,3 @@
|
|||
EXTRA_DIST = arlib.h debugpred.h
|
||||
|
||||
bin_SCRIPTS = make-debug-archive
|
||||
@@ -41,7 +46,7 @@
|
||||
|
||||
if BUILD_STATIC
|
||||
libasm = ../libasm/libasm.a
|
||||
-libdw = ../libdw/libdw.a -lz $(zip_LIBS) $(libelf) -ldl -lpthread
|
||||
+libdw = ../libdw/libdw.a -lz $(zip_LIBS) $(libelf) -ldl
|
||||
libelf = ../libelf/libelf.a -lz
|
||||
else
|
||||
libasm = ../libasm/libasm.so
|
||||
|
|
|
@ -11,9 +11,7 @@ TERMUX_PKG_DEPENDS="libgpg-error"
|
|||
TERMUX_PKG_BUILD_DEPENDS="binutils-cross"
|
||||
TERMUX_PKG_BREAKS="libgcrypt-dev"
|
||||
TERMUX_PKG_REPLACES="libgcrypt-dev"
|
||||
# configure tries to detect pthreads by linking with -lpthread, which does not exist on Android:
|
||||
TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
|
||||
ac_cv_lib_pthread_pthread_create=yes
|
||||
--disable-jent-support
|
||||
"
|
||||
|
||||
|
|
|
@ -1,12 +0,0 @@
|
|||
diff -uNr libisoburn-1.5.0/configure libisoburn-1.5.0.mod/configure
|
||||
--- libisoburn-1.5.0/configure 2018-09-15 17:16:51.000000000 +0300
|
||||
+++ libisoburn-1.5.0.mod/configure 2019-07-03 23:32:25.076457035 +0300
|
||||
@@ -12630,7 +12630,7 @@
|
||||
|
||||
fi
|
||||
|
||||
-THREAD_LIBS=-lpthread
|
||||
+THREAD_LIBS=
|
||||
|
||||
|
||||
|
|
@ -1,12 +0,0 @@
|
|||
diff -uNr libisofs-1.5.0/configure libisofs-1.5.0.mod/configure
|
||||
--- libisofs-1.5.0/configure 2018-09-16 11:40:44.000000000 +0300
|
||||
+++ libisofs-1.5.0.mod/configure 2019-07-03 23:00:54.218751674 +0300
|
||||
@@ -12593,7 +12593,7 @@
|
||||
fi
|
||||
|
||||
|
||||
-THREAD_LIBS=-lpthread
|
||||
+THREAD_LIBS=
|
||||
|
||||
|
||||
|
|
@ -1,11 +0,0 @@
|
|||
--- old/Project/GNU/Library/libmediainfo.pc.in 2021-09-17 11:10:35.000000000 +0200
|
||||
+++ Project/GNU/Library/libmediainfo.pc.in 2021-10-13 19:10:35.480823100 +0200
|
||||
@@ -3,7 +3,7 @@
|
||||
libdir=@libdir@
|
||||
includedir=@includedir@
|
||||
Unicode=@MediaInfoLib_Unicode@
|
||||
-Libs_Static=${libdir}/lib@MediaInfoLib_LibName@.a ${libdir}/libzen.a -lpthread -lz@Graphviz_Lib@@Curl_Lib@
|
||||
+Libs_Static=${libdir}/lib@MediaInfoLib_LibName@.a ${libdir}/libzen.a -lz@Graphviz_Lib@@Curl_Lib@
|
||||
la_name=lib@MediaInfoLib_LibName@.la
|
||||
|
||||
Name: libmediainfo
|
|
@ -23,12 +23,3 @@
|
|||
endif
|
||||
|
||||
ifneq ($(DIET),)
|
||||
@@ -197,7 +197,7 @@
|
||||
havesigio.h CAS.h
|
||||
|
||||
t: t.o libowfat.a libsocket
|
||||
- $(DIET) $(CCC) -g -o $@ t.o libowfat.a `cat libsocket` -lpthread $(LDFLAGS)
|
||||
+ $(DIET) $(CCC) -g -o $@ t.o libowfat.a `cat libsocket` $(LDFLAGS)
|
||||
|
||||
.PHONY: all clean tar install rename
|
||||
clean:
|
||||
|
|
|
@ -1,11 +0,0 @@
|
|||
diff -uNr libsearpc-3.1-latest/lib/Makefile.am libsearpc-3.1-latest.mod/lib/Makefile.am
|
||||
--- libsearpc-3.1-latest/lib/Makefile.am 2019-07-19 10:31:10.000000000 +0300
|
||||
+++ libsearpc-3.1-latest.mod/lib/Makefile.am 2019-07-25 18:03:05.629491489 +0300
|
||||
@@ -12,6 +12,6 @@
|
||||
|
||||
libsearpc_la_LDFLAGS = -version-info 1:2:0 -no-undefined
|
||||
|
||||
-libsearpc_la_LIBADD = @GLIB_LIBS@ @JANSSON_LIBS@ -lpthread
|
||||
+libsearpc_la_LIBADD = @GLIB_LIBS@ @JANSSON_LIBS@
|
||||
|
||||
dist_bin_SCRIPTS = searpc-codegen.py
|
|
@ -1,15 +0,0 @@
|
|||
--- ../Makefile.in.orig 2021-02-16 06:59:25.596423632 +0000
|
||||
+++ ./src/Makefile.in 2021-02-16 06:59:45.903064002 +0000
|
||||
@@ -90,10 +90,10 @@
|
||||
host_triplet = @host@
|
||||
@MINGW_TRUE@am__append_1 = -lm
|
||||
@ANDROID_TRUE@@MINGW_FALSE@am__append_2 = -ldl -lm
|
||||
-@ANDROID_FALSE@@MINGW_FALSE@am__append_3 = -lpthread -ldl -lm
|
||||
+@ANDROID_FALSE@@MINGW_FALSE@am__append_3 = -ldl -lm
|
||||
@MINGW_TRUE@am__append_4 = -lm
|
||||
@ANDROID_TRUE@@MINGW_FALSE@am__append_5 = -ldl -lm
|
||||
-@ANDROID_FALSE@@MINGW_FALSE@am__append_6 = -lpthread -ldl -lm
|
||||
+@ANDROID_FALSE@@MINGW_FALSE@am__append_6 = -ldl -lm
|
||||
subdir = src
|
||||
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
|
||||
am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
|
|
@ -11,11 +11,3 @@ TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
|
|||
--disable-v4l-utils
|
||||
--disable-qv4l2
|
||||
"
|
||||
|
||||
termux_step_pre_configure() {
|
||||
local f
|
||||
for f in lib/*/Makefile.in; do
|
||||
sed -i '/_la_LDFLAGS = /s/ -lpthread//' ${f}
|
||||
sed -i '/_la_LDFLAGS = /s/ -lrt / /' ${f}
|
||||
done
|
||||
}
|
||||
|
|
|
@ -1,28 +0,0 @@
|
|||
diff -uNr libX11-1.7.2/configure libX11-1.7.2.mod/configure
|
||||
--- libX11-1.7.2/configure 2021-06-06 19:49:01.000000000 +0300
|
||||
+++ libX11-1.7.2.mod/configure 2021-07-17 02:12:57.003231884 +0300
|
||||
@@ -20605,6 +20605,7 @@
|
||||
fi
|
||||
|
||||
|
||||
+if false; then
|
||||
# Check for flag to avoid builtin definitions - assumes unix is predefined,
|
||||
# which is not the best choice for supporting other OS'es, but covers most
|
||||
# of the ones we need for now.
|
||||
@@ -20653,6 +20654,7 @@
|
||||
fi
|
||||
fi
|
||||
rm -f conftest.$ac_ext
|
||||
+fi
|
||||
|
||||
|
||||
|
||||
@@ -22172,6 +22174,8 @@
|
||||
# XXX incomplete, please fill this in
|
||||
if test x$xthreads = xyes ; then
|
||||
case $host_os in
|
||||
+ linux*android*)
|
||||
+ ;;
|
||||
linux*|gnu*|k*bsd*-gnu)
|
||||
XTHREADLIB=-lpthread ;;
|
||||
netbsd*)
|
|
@ -1,62 +0,0 @@
|
|||
diff -r -u old/Project/CMake/libzen.pc.in ./Project/CMake/libzen.pc.in
|
||||
--- old/Project/CMake/libzen.pc.in 2021-03-25 15:29:18.000000000 +0100
|
||||
+++ ./Project/CMake/libzen.pc.in 2021-03-26 12:34:30.820891100 +0100
|
||||
@@ -3,10 +3,10 @@
|
||||
libdir=@LIB_INSTALL_DIR@
|
||||
includedir=@INCLUDE_INSTALL_DIR@
|
||||
Unicode=@ZenLib_Unicode@
|
||||
-Libs_Static=@LIB_INSTALL_DIR@/libzen.a -lpthread
|
||||
+Libs_Static=@LIB_INSTALL_DIR@/libzen.a
|
||||
|
||||
Name: libzen
|
||||
Version: @ZenLib_VERSION@
|
||||
Description: ZenLib
|
||||
-Libs: -L${libdir} -lzen -lpthread
|
||||
+Libs: -L${libdir} -lzen
|
||||
Cflags: -I${includedir} @ZenLib_CXXFLAGS@
|
||||
Only in ./Project: CodeBlocks
|
||||
Only in ./Project: Coverity
|
||||
Only in ./Project/GNU/Library: Makefile.am
|
||||
Only in ./Project/GNU/Library: autogen.sh
|
||||
diff -r -u old/Project/GNU/Library/configure.ac ./Project/GNU/Library/configure.ac
|
||||
--- old/Project/GNU/Library/configure.ac 2021-03-25 15:29:19.000000000 +0100
|
||||
+++ ./Project/GNU/Library/configure.ac 2021-03-26 12:34:30.841028100 +0100
|
||||
@@ -144,10 +144,10 @@
|
||||
dnl Common
|
||||
dnl
|
||||
if test "$enable_shared" = "yes"; then
|
||||
- ZenLib_LIBS="-L$(pwd)/.libs -lzen -lpthread $ZenLib_LIBS"
|
||||
+ ZenLib_LIBS="-L$(pwd)/.libs -lzen $ZenLib_LIBS"
|
||||
fi
|
||||
if test "$enable_static" = "yes"; then
|
||||
- ZenLib_LIBS_Static="$(pwd)/.libs/libzen.a -lpthread $ZenLib_LIBS_Static"
|
||||
+ ZenLib_LIBS_Static="$(pwd)/.libs/libzen.a $ZenLib_LIBS_Static"
|
||||
fi
|
||||
|
||||
dnl #########################################################################
|
||||
@@ -252,7 +252,7 @@
|
||||
dnl -------------------------------------------------------------------------
|
||||
dnl External libs
|
||||
dnl
|
||||
-LDFLAGS="$LDFLAGS -lpthread"
|
||||
+LDFLAGS="$LDFLAGS"
|
||||
|
||||
dnl -------------------------------------------------------------------------
|
||||
dnl Check if thread safe variants of time functions are available
|
||||
Only in ./Project/GNU/Library: libzen-config.in
|
||||
diff -r -u old/Project/GNU/Library/libzen.pc.in ./Project/GNU/Library/libzen.pc.in
|
||||
--- old/Project/GNU/Library/libzen.pc.in 2021-03-25 15:29:18.000000000 +0100
|
||||
+++ ./Project/GNU/Library/libzen.pc.in 2021-03-26 12:34:52.385894900 +0100
|
||||
@@ -4,10 +4,10 @@
|
||||
includedir=@includedir@
|
||||
Unicode=@ZenLib_Unicode@
|
||||
WstringMissing=@ZenLib_wstring_missing@
|
||||
-Libs_Static=@libdir@/libzen.a -lpthread
|
||||
+Libs_Static=@libdir@/libzen.a
|
||||
|
||||
Name: libzen
|
||||
Version: @PACKAGE_VERSION@
|
||||
Description: ZenLib
|
||||
-Libs: -L${libdir} -lzen -lpthread
|
||||
+Libs: -L${libdir} -lzen
|
||||
Cflags: -I${includedir} @ZenLib_CXXFLAGS@
|
|
@ -19,15 +19,6 @@
|
|||
LDLFAGS +=
|
||||
LDLIBS +=
|
||||
|
||||
@@ -42,7 +41,7 @@
|
||||
ZITA-CONVOLVER_SO = libzita-convolver.so
|
||||
ZITA-CONVOLVER_MAJ = $(ZITA-CONVOLVER_SO).$(MAJVERS)
|
||||
ZITA-CONVOLVER_MIN = $(ZITA-CONVOLVER_MAJ).$(MINVERS)
|
||||
-ZITA-CONVOLVER_DEP = -lfftw3f -lpthread
|
||||
+ZITA-CONVOLVER_DEP = -lfftw3f
|
||||
ZITA-CONVOLVER_O = zita-convolver.o
|
||||
ZITA-CONVOLVER_H = zita-convolver.h
|
||||
|
||||
@@ -56,8 +55,8 @@
|
||||
install -d $(DESTDIR)$(LIBDIR)
|
||||
install -m 644 $(ZITA-CONVOLVER_H) $(DESTDIR)$(INCDIR)
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
diff -uNr microsocks/Makefile microsocks-mod/Makefile
|
||||
--- microsocks/Makefile 2020-10-02 23:56:02.119088328 +0600
|
||||
+++ microsocks-mod/Makefile 2020-10-03 00:58:49.228942473 +0600
|
||||
@@ -1,14 +1,13 @@
|
||||
@@ -1,7 +1,7 @@
|
||||
# if you want to change/override some variables, do so in a file called
|
||||
# config.mak, which is gets included automatically if it exists.
|
||||
|
||||
|
@ -10,9 +10,3 @@ diff -uNr microsocks/Makefile microsocks-mod/Makefile
|
|||
bindir = $(prefix)/bin
|
||||
|
||||
PROG = microsocks
|
||||
SRCS = sockssrv.c server.c sblist.c sblist_delete.c
|
||||
OBJS = $(SRCS:.c=.o)
|
||||
|
||||
-LIBS = -lpthread
|
||||
|
||||
CFLAGS += -Wall -std=c99
|
||||
|
|
|
@ -1,11 +0,0 @@
|
|||
--- ./GNUmakefile.in~ 2022-07-01 00:19:56.000000000 +0200
|
||||
+++ ./GNUmakefile.in 2022-07-30 16:12:21.590008564 +0200
|
||||
@@ -69,7 +69,7 @@
|
||||
ALL_C= $(patsubst %.c.o,%.c,$(filter %.c.o %.c,$(ALL_O)))
|
||||
CLEAN_O= $(filter %.o,$(ALL_O))
|
||||
|
||||
-MAIN_LIB= -lpthread -lsodium @MAINLIB@
|
||||
+MAIN_LIB= -lsodium @MAINLIB@
|
||||
UTIL_CALCEST_LIB= -lm
|
||||
TEST_ED25519_LIB= -lsodium
|
||||
|
|
@ -25,15 +25,6 @@
|
|||
|
||||
$(OUT)/%.$(SO):
|
||||
$(LINK_CMD) $(LIB_LDFLAGS) $(THIRD_LIBS) $(LIBCRYPTO_LIBS)
|
||||
@@ -362,7 +364,7 @@
|
||||
$(OUT)/example: docs/examples/example.c $(MUPDF_LIB) $(THIRD_LIB)
|
||||
$(LINK_CMD) $(CFLAGS) $(THIRD_LIBS)
|
||||
$(OUT)/multi-threaded: docs/examples/multi-threaded.c $(MUPDF_LIB) $(THIRD_LIB)
|
||||
- $(LINK_CMD) $(CFLAGS) $(THIRD_LIBS) -lpthread
|
||||
+ $(LINK_CMD) $(CFLAGS) $(THIRD_LIBS)
|
||||
$(OUT)/storytest: docs/examples/storytest.c $(MUPDF_LIB) $(THIRD_LIB)
|
||||
$(LINK_CMD) $(CFLAGS) $(THIRD_LIBS)
|
||||
|
||||
@@ -413,9 +415,9 @@
|
||||
install -m 644 $(LIBS_TO_INSTALL_IN_LIB) $(DESTDIR)$(libdir)
|
||||
endif
|
||||
|
|
|
@ -11,12 +11,3 @@ diff -uNr mupdf-1.15.0-source/Makerules mupdf-1.15.0-source.mod/Makerules
|
|||
|
||||
ifeq ($(shell pkg-config --exists freetype2 && echo yes),yes)
|
||||
SYS_FREETYPE_CFLAGS := $(shell pkg-config --cflags freetype2)
|
||||
@@ -186,7 +187,7 @@
|
||||
HAVE_PTHREAD := yes
|
||||
ifeq ($(HAVE_PTHREAD),yes)
|
||||
PTHREAD_CFLAGS :=
|
||||
- PTHREAD_LIBS := -lpthread
|
||||
+ PTHREAD_LIBS :=
|
||||
endif
|
||||
|
||||
endif
|
||||
|
|
|
@ -1,15 +0,0 @@
|
|||
--- ../cache/ncmpcpp-8134e6e23b2787322fa10e65e44d286da82eea91/configure.ac 2017-04-23 02:24:57.000000000 +0000
|
||||
+++ ./configure.ac 2017-05-06 00:32:15.468042009 +0000
|
||||
@@ -147,9 +147,9 @@
|
||||
fi
|
||||
|
||||
# pthread
|
||||
-AC_CHECK_LIB(pthread, pthread_create, LIBS="$LIBS -lpthread",
|
||||
- AC_MSG_ERROR([pthread library is required])
|
||||
-)
|
||||
+#AC_CHECK_LIB(pthread, pthread_create, LIBS="$LIBS -lboost_thread",
|
||||
+# AC_MSG_ERROR([pthread library is required])
|
||||
+#)
|
||||
|
||||
# ncursesw
|
||||
PKG_CHECK_MODULES([ncursesw], [ncursesw], [
|
|
@ -14,16 +14,7 @@
|
|||
NEWSBOAT_SRCS:=$(shell cat mk/newsboat.deps)
|
||||
NEWSBOAT_OBJS:=$(patsubst %.cpp,%.o,$(NEWSBOAT_SRCS))
|
||||
-NEWSBOAT_LIBS=-lboat -lnewsboat -lfilter -lpthread -lrsspp -ldl
|
||||
+NEWSBOAT_LIBS=-lboat -lnewsboat -lfilter -lrsspp -landroid-glob -ldl
|
||||
+NEWSBOAT_LIBS=-lboat -lnewsboat -lfilter -lpthread -lrsspp -landroid-glob -ldl
|
||||
|
||||
RSSPPLIB_SRCS=$(sort $(wildcard rss/*.cpp))
|
||||
RSSPPLIB_OBJS=$(patsubst rss/%.cpp,rss/%.o,$(RSSPPLIB_SRCS))
|
||||
@@ -65,7 +65,7 @@
|
||||
PODBOAT=podboat
|
||||
PODBOAT_SRCS:=$(shell cat mk/podboat.deps)
|
||||
PODBOAT_OBJS:=$(patsubst %.cpp,%.o,$(PODBOAT_SRCS))
|
||||
-PODBOAT_LIBS=-lboat -lnewsboat -lfilter -lpthread -ldl
|
||||
+PODBOAT_LIBS=-lboat -lnewsboat -lfilter -ldl
|
||||
|
||||
TEST_SRCS:=$(wildcard test/*.cpp test/test_helpers/*.cpp)
|
||||
TEST_OBJS:=$(patsubst %.cpp,%.o,$(TEST_SRCS))
|
||||
|
|
|
@ -1,11 +0,0 @@
|
|||
diff -u -r ../nginx-1.14.0/auto/threads ./auto/threads
|
||||
--- ../nginx-1.14.0/auto/threads 2018-04-17 15:22:36.000000000 +0000
|
||||
+++ ./auto/threads 2018-05-19 01:20:25.703633445 +0000
|
||||
@@ -16,6 +16,5 @@
|
||||
have=NGX_THREADS . auto/have
|
||||
CORE_DEPS="$CORE_DEPS $THREAD_POOL_DEPS"
|
||||
CORE_SRCS="$CORE_SRCS $THREAD_POOL_SRCS"
|
||||
- CORE_LIBS="$CORE_LIBS -lpthread"
|
||||
- NGX_LIBPTHREAD="-lpthread"
|
||||
+ NGX_LIBPTHREAD=""
|
||||
fi
|
|
@ -1,11 +0,0 @@
|
|||
--- ./Makefile 2021-06-11 10:11:55.904569633 +0530
|
||||
+++ ./Makefile.mod 2021-06-11 10:14:26.184569576 +0530
|
||||
@@ -133,7 +133,7 @@
|
||||
CFLAGS += $(CFLAGS_OPTIMIZATION)
|
||||
CFLAGS += $(CFLAGS_CURSES)
|
||||
|
||||
-LDLIBS += $(LDLIBS_CURSES) -lpthread
|
||||
+LDLIBS += $(LDLIBS_CURSES)
|
||||
|
||||
# static compilation needs libgpm development package
|
||||
ifeq ($(strip $(O_STATIC)),1)
|
|
@ -9,12 +9,3 @@
|
|||
BINDIR:=${PREFIX}/bin
|
||||
LIBDIR:=${PREFIX}/lib
|
||||
INCDIR:=${PREFIX}/include
|
||||
@@ -64,7 +64,7 @@
|
||||
${LIBAV_CFLAGS} ${LIBCURL_CFLAGS} \
|
||||
${LIBGCRYPT_CFLAGS} ${LIBJSONC_CFLAGS} \
|
||||
${LIBAO_CFLAGS}
|
||||
-ALL_LDFLAGS:=${LDFLAGS} -lpthread -lm \
|
||||
+ALL_LDFLAGS:=${LDFLAGS} -lm \
|
||||
${LIBAV_LDFLAGS} ${LIBCURL_LDFLAGS} \
|
||||
${LIBGCRYPT_LDFLAGS} ${LIBJSONC_LDFLAGS} \
|
||||
${LIBAO_LDFLAGS}
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
--- ./Makefile.orig 2021-02-04 19:47:43.746288080 +0000
|
||||
+++ ./Makefile 2021-02-04 19:48:32.749583554 +0000
|
||||
@@ -1,11 +1,11 @@
|
||||
@@ -1,5 +1,5 @@
|
||||
-CC=gcc
|
||||
-CFLAGS=-O3 -Wall -Wextra -Wno-unknown-pragmas -Wcast-qual
|
||||
-LDFLAGS=
|
||||
|
@ -9,10 +9,3 @@
|
|||
+LDFLAGS?=
|
||||
# CFLAGS=-O3 -Wall -Wextra -Wno-unknown-pragmas -Wcast-qual -g -fsanitize=thread
|
||||
# LDFLAGS=-g -fsanitize=thread
|
||||
# CFLAGS=-O3 -Wall -Wextra -Wno-unknown-pragmas -Wcast-qual -g -fsanitize=address
|
||||
# LDFLAGS=-g -fsanitize=address
|
||||
-LIBS=-lm -lpthread -lz
|
||||
+LIBS=-lm -lz
|
||||
ZOPFLI=zopfli/src/zopfli/
|
||||
ZOP=deflate.o blocksplitter.o tree.o lz77.o cache.o hash.o util.o squeeze.o katajainen.o symbols.o
|
||||
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
--- a/configure
|
||||
+++ b/configure
|
||||
@@ -21,11 +21,11 @@
|
||||
@@ -21,10 +21,10 @@
|
||||
datarootdir='$(prefix)/share'
|
||||
infodir='$(datarootdir)/info'
|
||||
mandir='$(datarootdir)/man'
|
||||
|
@ -8,12 +8,10 @@
|
|||
-CPPFLAGS=
|
||||
-CXXFLAGS='-Wall -W -O2'
|
||||
-LDFLAGS=
|
||||
-LIBS='-llz -lpthread'
|
||||
+CXX?=g++
|
||||
+CPPFLAGS?=
|
||||
+CXXFLAGS?='-Wall -W -O2'
|
||||
+LDFLAGS?=
|
||||
+LIBS='-llz'
|
||||
LIBS='-llz -lpthread'
|
||||
|
||||
# checking whether we are using GNU C++.
|
||||
/bin/sh -c "${CXX} --version" > /dev/null 2>&1 || { CXX=c++ ; CXXFLAGS=-O2 ; }
|
||||
|
|
|
@ -64,12 +64,3 @@ diff -u -r ../rtmpdump-2.4/Makefile ./Makefile
|
|||
|
||||
BINDIR=$(DESTDIR)$(bindir)
|
||||
SBINDIR=$(DESTDIR)$(sbindir)
|
||||
@@ -38,7 +33,7 @@
|
||||
LIB_RTMP=-Llibrtmp -lrtmp
|
||||
LIBS=$(LIB_RTMP) $(CRYPTO_LIB) $(LIBS_$(SYS)) $(XLIBS)
|
||||
|
||||
-THREADLIB_posix=-lpthread
|
||||
+THREADLIB_posix=
|
||||
THREADLIB_darwin=-lpthread
|
||||
THREADLIB_mingw=
|
||||
THREADLIB=$(THREADLIB_$(SYS))
|
||||
|
|
|
@ -4,4 +4,4 @@
|
|||
all:
|
||||
- g++ -std=c++11 main.cpp snake.cpp input.cpp snake_map.cpp -o snake -lpthread
|
||||
\ No newline at end of file
|
||||
+ $(CXX) $(CFLAGS) $(CXXFLAGS) $(LDFLAGS) -std=c++11 main.cpp snake.cpp input.cpp snake_map.cpp -o snake
|
||||
+ $(CXX) $(CFLAGS) $(CXXFLAGS) $(LDFLAGS) -std=c++11 main.cpp snake.cpp input.cpp snake_map.cpp -o snake -lpthread
|
||||
|
|
|
@ -1,48 +0,0 @@
|
|||
diff -uNr speechd-0.11.2/src/clients/say/Makefile.am speechd-0.11.2.mod/src/clients/say/Makefile.am
|
||||
--- speechd-0.11.2/src/clients/say/Makefile.am 2022-08-26 06:13:57.000000000 +0800
|
||||
+++ speechd-0.11.2.mod/src/clients/say/Makefile.am 2022-08-26 10:07:12.045684832 +0800
|
||||
@@ -23,7 +23,7 @@
|
||||
bin_PROGRAMS = spd-say
|
||||
spd_say_CPPFLAGS = $(inc_local) $(GLIB_CFLAGS)
|
||||
spd_say_SOURCES = say.c options.c options.h
|
||||
-spd_say_LDADD = $(c_api)/libspeechd.la $(EXTRA_SOCKET_LIBS) $(top_builddir)/src/common/libcommon.la -lpthread
|
||||
+spd_say_LDADD = $(c_api)/libspeechd.la $(EXTRA_SOCKET_LIBS) $(top_builddir)/src/common/libcommon.la
|
||||
|
||||
if HAVE_HELP2MAN
|
||||
spd-say.1: spd-say$(EXEEXT)
|
||||
diff -uNr speechd-0.11.2/src/clients/spdsend/Makefile.am speechd-0.11.2.mod/src/clients/spdsend/Makefile.am
|
||||
--- speechd-0.11.2/src/clients/spdsend/Makefile.am 2022-08-26 06:13:57.000000000 +0800
|
||||
+++ speechd-0.11.2.mod/src/clients/spdsend/Makefile.am 2022-08-26 10:07:29.335684826 +0800
|
||||
@@ -19,7 +19,7 @@
|
||||
|
||||
bin_PROGRAMS = spdsend
|
||||
spdsend_SOURCES = spdsend.h spdsend.c server.c client.c common.c
|
||||
-spdsend_LDADD = $(EXTRA_SOCKET_LIBS) -lpthread
|
||||
+spdsend_LDADD = $(EXTRA_SOCKET_LIBS)
|
||||
|
||||
|
||||
-include $(top_srcdir)/git.mk
|
||||
diff -uNr speechd-0.11.2/src/modules/Makefile.am speechd-0.11.2.mod/src/modules/Makefile.am
|
||||
--- speechd-0.11.2/src/modules/Makefile.am 2022-08-26 06:13:57.000000000 +0800
|
||||
+++ speechd-0.11.2.mod/src/modules/Makefile.am 2022-08-26 10:07:48.025684819 +0800
|
||||
@@ -28,7 +28,7 @@
|
||||
|
||||
inc_local = -I$(top_srcdir)/include -I$(top_srcdir)/src/common
|
||||
common_SOURCES = module_main.c module_readline.c module_process.c module_config.c module_utils.c module_utils.h
|
||||
-common_LDADD = $(DOTCONF_LIBS) $(GLIB_LIBS) $(audio_dlopen) -lpthread
|
||||
+common_LDADD = $(DOTCONF_LIBS) $(GLIB_LIBS) $(audio_dlopen)
|
||||
|
||||
AM_CFLAGS = $(ERROR_CFLAGS)
|
||||
AM_CXXFLAGS = $(ERROR_CFLAGS)
|
||||
diff -uNr speechd-0.11.2/src/tests/Makefile.am speechd-0.11.2.mod/src/tests/Makefile.am
|
||||
--- speechd-0.11.2/src/tests/Makefile.am 2022-08-26 06:13:57.000000000 +0800
|
||||
+++ speechd-0.11.2.mod/src/tests/Makefile.am 2022-08-26 10:08:07.925684811 +0800
|
||||
@@ -61,7 +61,7 @@
|
||||
clibrary2_LDADD = $(c_api)/libspeechd.la $(EXTRA_SOCKET_LIBS)
|
||||
|
||||
clibrary3_SOURCES = clibrary2.c
|
||||
-clibrary3_LDADD = $(c_api)/libspeechd.la $(EXTRA_SOCKET_LIBS) -lpthread
|
||||
+clibrary3_LDADD = $(c_api)/libspeechd.la $(EXTRA_SOCKET_LIBS)
|
||||
clibrary3_CPPFLAGS = $(AM_CPPFLAGS) -DTHOROUGH
|
||||
|
||||
connection_recovery_SOURCES = connection-recovery.c
|
|
@ -1,14 +1,5 @@
|
|||
--- a/spipe/Makefile 2021-12-24 19:27:38.000000000 +0000
|
||||
+++ b/spipe/Makefile 2022-04-15 16:22:46.461946207 +0000
|
||||
@@ -4,7 +4,7 @@
|
||||
MAN1=spipe.1
|
||||
SRCS=main.c pushbits.c
|
||||
IDIRS=-I../libcperciva/crypto -I../libcperciva/events -I../libcperciva/util -I../lib/proto -I../lib/util
|
||||
-LDADD_REQ=-lcrypto -lpthread
|
||||
+LDADD_REQ=-lcrypto
|
||||
SUBDIR_DEPTH=..
|
||||
RELATIVE_DIR=spipe
|
||||
LIBALL=../liball/liball.a
|
||||
@@ -21,7 +21,6 @@
|
||||
install:${PROG}
|
||||
mkdir -p ${BINDIR}
|
||||
|
@ -19,15 +10,6 @@
|
|||
if ! [ -z "${MAN1DIR}" ]; then \
|
||||
--- a/spiped/Makefile 2021-12-24 19:27:38.000000000 +0000
|
||||
+++ b/spiped/Makefile 2022-04-15 17:39:31.740187413 +0000
|
||||
@@ -4,7 +4,7 @@
|
||||
MAN1=spiped.1
|
||||
SRCS=main.c dispatch.c
|
||||
IDIRS=-I../libcperciva/crypto -I../libcperciva/events -I../libcperciva/network -I../libcperciva/util -I../lib/dnsthread -I../lib/proto -I../lib/util
|
||||
-LDADD_REQ=-lcrypto -lpthread
|
||||
+LDADD_REQ=-lcrypto
|
||||
SUBDIR_DEPTH=..
|
||||
RELATIVE_DIR=spiped
|
||||
LIBALL=../liball/liball.a
|
||||
@@ -21,7 +21,6 @@
|
||||
install:${PROG}
|
||||
mkdir -p ${BINDIR}
|
||||
|
|
|
@ -1,39 +0,0 @@
|
|||
diff -uNr streamripper-1.64.6/configure streamripper-1.64.6.mod/configure
|
||||
--- streamripper-1.64.6/configure 2009-03-31 04:51:13.000000000 +0300
|
||||
+++ streamripper-1.64.6.mod/configure 2020-01-02 01:33:25.603677178 +0200
|
||||
@@ -5374,7 +5374,7 @@
|
||||
$as_echo_n "(cached) " >&6
|
||||
else
|
||||
ac_check_lib_save_LIBS=$LIBS
|
||||
-LIBS="-lpthread $LIBS"
|
||||
+LIBS="$LIBS"
|
||||
cat >conftest.$ac_ext <<_ACEOF
|
||||
/* confdefs.h. */
|
||||
_ACEOF
|
||||
@@ -5434,7 +5434,7 @@
|
||||
{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_pthread_pthread_create" >&5
|
||||
$as_echo "$ac_cv_lib_pthread_pthread_create" >&6; }
|
||||
if test "x$ac_cv_lib_pthread_pthread_create" = x""yes; then
|
||||
- THREADLIBS="-lpthread"
|
||||
+ THREADLIBS=""
|
||||
fi
|
||||
|
||||
if test "$THREADLIBS" = no; then
|
||||
@@ -5586,7 +5586,7 @@
|
||||
$as_echo_n "(cached) " >&6
|
||||
else
|
||||
ac_check_lib_save_LIBS=$LIBS
|
||||
-LIBS="-lpthreads $LIBS"
|
||||
+LIBS="$LIBS"
|
||||
cat >conftest.$ac_ext <<_ACEOF
|
||||
/* confdefs.h. */
|
||||
_ACEOF
|
||||
@@ -5646,7 +5646,7 @@
|
||||
{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_pthreads_pthread_create" >&5
|
||||
$as_echo "$ac_cv_lib_pthreads_pthread_create" >&6; }
|
||||
if test "x$ac_cv_lib_pthreads_pthread_create" = x""yes; then
|
||||
- THREADLIBS="-lpthreads"
|
||||
+ THREADLIBS=""
|
||||
fi
|
||||
|
||||
fi
|
|
@ -1,11 +0,0 @@
|
|||
--- a/testcode/Makefile
|
||||
+++ b/testcode/Makefile
|
||||
@@ -5,7 +5,7 @@
|
||||
|
||||
INCLUDES := $(BOOST_INCLUDE) $(OPENSSL_INCLUDE) -I../common -I../stuncore -I../networkutils
|
||||
LIB_PATH := -L../networkutils -L../stuncore -L../common
|
||||
-LIBS := -lnetworkutils -lstuncore -lcommon -lpthread
|
||||
+LIBS := -lnetworkutils -lstuncore -lcommon
|
||||
|
||||
|
||||
all: $(PROJECT_TARGET)
|
|
@ -1,42 +0,0 @@
|
|||
--- a/Source/App/DecApp/CMakeLists.txt
|
||||
+++ b/Source/App/DecApp/CMakeLists.txt
|
||||
@@ -30,7 +30,6 @@
|
||||
|
||||
if(UNIX)
|
||||
target_link_libraries(SvtAv1DecApp
|
||||
- pthread
|
||||
m)
|
||||
endif()
|
||||
|
||||
--- a/Source/App/EncApp/CMakeLists.txt
|
||||
+++ b/Source/App/EncApp/CMakeLists.txt
|
||||
@@ -33,7 +33,6 @@
|
||||
SvtAv1Enc)
|
||||
if(UNIX)
|
||||
target_link_libraries(SvtAv1EncApp
|
||||
- pthread
|
||||
m)
|
||||
endif()
|
||||
|
||||
--- a/Source/Lib/Decoder/CMakeLists.txt
|
||||
+++ b/Source/Lib/Decoder/CMakeLists.txt
|
||||
@@ -24,7 +24,7 @@
|
||||
endif()
|
||||
list(APPEND PLATFORM_LIBS Threads::Threads)
|
||||
endif()
|
||||
- set(LIBS_PRIVATE "-lpthread -lm")
|
||||
+ set(LIBS_PRIVATE "-lm")
|
||||
endif()
|
||||
|
||||
if(COVERAGE)
|
||||
--- a/Source/Lib/Encoder/CMakeLists.txt
|
||||
+++ b/Source/Lib/Encoder/CMakeLists.txt
|
||||
@@ -25,7 +25,7 @@
|
||||
endif()
|
||||
list(APPEND PLATFORM_LIBS Threads::Threads)
|
||||
endif()
|
||||
- set(LIBS_PRIVATE "-lpthread -lm")
|
||||
+ set(LIBS_PRIVATE "-lm")
|
||||
endif()
|
||||
|
||||
if(COVERAGE)
|
|
@ -1,14 +1,11 @@
|
|||
--- a/Makefile.in
|
||||
+++ b/Makefile.in
|
||||
@@ -4,9 +4,9 @@
|
||||
@@ -4,7 +4,7 @@
|
||||
LDFLAGS=@LDFLAGS@ @OPENSSL_LDFLAGS@
|
||||
CPPFLAGS=@CPPFLAGS@ @OPENSSL_INCLUDES@
|
||||
DEFS=@DEFS@
|
||||
-COMPILE_FLAGS=${CFLAGS} ${CPFLAGS} ${CPPFLAGS} ${DEFS} -Wall -Werror -Wextra -Wno-missing-field-initializers -Wno-deprecated-declarations -fno-strict-aliasing -fno-omit-frame-pointer -ggdb -Wno-unused-parameter -fPIC
|
||||
+COMPILE_FLAGS=${CFLAGS} ${CPFLAGS} ${CPPFLAGS} ${DEFS} -Wall -Werror -Wextra -Wno-missing-field-initializers -Wno-deprecated-declarations -fno-strict-aliasing -fno-omit-frame-pointer -ggdb -Wno-unused-parameter -Wno-unused-but-set-variable -fPIC
|
||||
EXTRA_LIBS=@LIBS@ @EXTRA_LIBS@ @OPENSSL_LIBS@
|
||||
-LOCAL_LDFLAGS=-rdynamic -ggdb -levent ${EXTRA_LIBS} -ldl -lpthread -lutil
|
||||
+LOCAL_LDFLAGS=-rdynamic -ggdb -levent ${EXTRA_LIBS} -ldl
|
||||
LOCAL_LDFLAGS=-rdynamic -ggdb -levent ${EXTRA_LIBS} -ldl -lpthread -lutil
|
||||
LINK_FLAGS=${LDFLAGS} ${LOCAL_LDFLAGS}
|
||||
|
||||
DEP=dep
|
||||
|
|
|
@ -1,10 +0,0 @@
|
|||
--- ./src/Makefile.in 2022-05-28 17:46:47.805190949 +0000
|
||||
+++ ./src/Makefile.in 2022-05-28 17:47:03.734181908 +0000
|
||||
@@ -349,7 +349,7 @@
|
||||
transparent-proxy.c transparent-proxy.h
|
||||
|
||||
tinyproxy_DEPENDENCIES = @ADDITIONAL_OBJECTS@
|
||||
-tinyproxy_LDADD = @ADDITIONAL_OBJECTS@ -lpthread
|
||||
+tinyproxy_LDADD = @ADDITIONAL_OBJECTS@
|
||||
EXTRA_DIST = conf-tokens.gperf conf-tokens-gperf.inc
|
||||
all: all-am
|
|
@ -1,12 +0,0 @@
|
|||
diff -uNr ugrep-3.9.2/configure.ac ugrep-3.9.2.mod/configure.ac
|
||||
--- ugrep-3.9.2/configure.ac 2022-08-21 19:20:26.000000000 +0300
|
||||
+++ ugrep-3.9.2.mod/configure.ac 2022-10-29 15:09:34.749719948 +0300
|
||||
@@ -292,7 +292,7 @@
|
||||
AC_SUBST(SIMD_AVX512BW_FLAGS)
|
||||
|
||||
AC_SUBST([PTHREAD_CFLAGS], [""])
|
||||
-AC_SUBST([PTHREAD_LIBS], ["-lpthread"])
|
||||
+AC_SUBST([PTHREAD_LIBS], [""])
|
||||
|
||||
AC_CONFIG_FILES([Makefile lib/Makefile src/Makefile])
|
||||
|
|
@ -1,68 +0,0 @@
|
|||
diff -uNr unicorn-2.0.0/CMakeLists.txt unicorn-2.0.0.mod/CMakeLists.txt
|
||||
--- unicorn-2.0.0/CMakeLists.txt 2022-07-07 18:49:09.000000000 +0300
|
||||
+++ unicorn-2.0.0.mod/CMakeLists.txt 2022-07-21 01:20:23.722263943 +0300
|
||||
@@ -1159,10 +1159,6 @@
|
||||
${UNICORN_COMMON_SRCS}
|
||||
)
|
||||
|
||||
-if(NOT MSVC AND NOT ANDROID_ABI)
|
||||
- target_link_libraries(unicorn-common PRIVATE pthread)
|
||||
-endif()
|
||||
-
|
||||
add_library(unicorn ${UNICORN_SRCS})
|
||||
# For static archive
|
||||
if (BUILD_SHARED_LIBS)
|
||||
@@ -1340,7 +1336,6 @@
|
||||
elseif(NOT ANDROID_ABI)
|
||||
set(SAMPLES_LIB
|
||||
unicorn
|
||||
- pthread
|
||||
)
|
||||
else()
|
||||
set(SAMPLES_LIB
|
||||
@@ -1434,7 +1429,7 @@
|
||||
libdir=${CMAKE_INSTALL_FULL_LIBDIR}\n\
|
||||
includedir=${CMAKE_INSTALL_FULL_INCLUDEDIR}\n\
|
||||
Libs: -L\$\{libdir\} -lunicorn\n\
|
||||
-Libs.private: -lpthread -lm\n\
|
||||
+Libs.private: -lm\n\
|
||||
Cflags: -I\$\{includedir\}\n"
|
||||
)
|
||||
install(FILES ${CMAKE_BINARY_DIR}/unicorn.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
|
||||
diff -uNr unicorn-2.0.0/qemu/configure unicorn-2.0.0.mod/qemu/configure
|
||||
--- unicorn-2.0.0/qemu/configure 2022-07-07 18:49:09.000000000 +0300
|
||||
+++ unicorn-2.0.0.mod/qemu/configure 2022-07-21 01:11:49.021654442 +0300
|
||||
@@ -1245,6 +1245,7 @@
|
||||
PTHREADLIBS_LIST="-pthread -lpthread -lpthreadGC2"
|
||||
|
||||
pthread=no
|
||||
+if false; then
|
||||
cat > $TMPC << EOF
|
||||
#include <pthread.h>
|
||||
static void *f(void *p) { return NULL; }
|
||||
@@ -1280,6 +1281,7 @@
|
||||
error_exit "pthread check failed" \
|
||||
"Make sure to have the pthread libs and headers installed."
|
||||
fi
|
||||
+fi
|
||||
|
||||
# check for pthread_setname_np with thread id
|
||||
pthread_setname_np_w_tid=no
|
||||
diff -uNr unicorn-2.0.0/samples/Makefile unicorn-2.0.0.mod/samples/Makefile
|
||||
--- unicorn-2.0.0/samples/Makefile 2022-07-07 18:49:09.000000000 +0300
|
||||
+++ unicorn-2.0.0.mod/samples/Makefile 2022-07-21 01:10:30.720936535 +0300
|
||||
@@ -14,12 +14,12 @@
|
||||
|
||||
CFLAGS += -Wall -Werror -I../include
|
||||
|
||||
-LDFLAGS += -L$(LIBDIR) -lunicorn -lpthread -lm
|
||||
+LDFLAGS += -L$(LIBDIR) -lunicorn -lm
|
||||
ifeq ($(UNAME_S), Linux)
|
||||
LDFLAGS += -lrt
|
||||
endif
|
||||
|
||||
-LDLIBS += -lpthread -lunicorn -lm
|
||||
+LDLIBS += -lunicorn -lm
|
||||
|
||||
ifneq ($(CROSS),)
|
||||
CC = $(CROSS)gcc
|
|
@ -1,14 +1,5 @@
|
|||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -19,7 +19,7 @@
|
||||
PKG_CHECK_MODULES(libusb, libusb-1.0 >= 1.0.9)
|
||||
PKG_CHECK_MODULES(libplist, libplist-2.0 >= 2.2.0)
|
||||
PKG_CHECK_MODULES(libimobiledevice, libimobiledevice-1.0 >= 1.3.0, have_limd=yes, have_limd=no)
|
||||
-AC_CHECK_LIB(pthread, [pthread_create, pthread_mutex_lock], [AC_SUBST(libpthread_LIBS,[-lpthread])], [AC_MSG_ERROR([libpthread is required to build usbmuxd])])
|
||||
+AC_CHECK_LIB(pthread, [pthread_create, pthread_mutex_lock], [AC_SUBST(libpthread_LIBS,[-lpthread])], [AC_MSG_NOTICE([libpthread is required to build usbmuxd])])
|
||||
|
||||
AC_ARG_WITH([preflight],
|
||||
[AS_HELP_STRING([--without-preflight],
|
||||
@@ -108,8 +108,6 @@
|
||||
AC_SEARCH_LIBS([clock_gettime],[rt posix4])
|
||||
|
||||
|
|
|
@ -18,15 +18,6 @@
|
|||
|
||||
additional_include_paths = self.get('additional_include_paths')
|
||||
if additional_include_paths:
|
||||
@@ -762,7 +762,7 @@
|
||||
self.cflags.append('-Wno-format -Wno-format-security')
|
||||
|
||||
self.ldflags = os.environ.get("LDFLAGS", "").split()
|
||||
- self.libs = ['-lpthread', '-lm', '-rdynamic']
|
||||
+ self.libs = ['-lm', '-rdynamic']
|
||||
if uwsgi_os in ('Linux', 'GNU', 'GNU/kFreeBSD'):
|
||||
self.libs.append('-ldl')
|
||||
if uwsgi_os == 'GNU/kFreeBSD':
|
||||
@@ -1079,23 +1079,23 @@
|
||||
# re-enable after pcre fix
|
||||
if self.get('pcre'):
|
||||
|
|
|
@ -34,22 +34,3 @@ diff -u -r ../vifm-0.9.1/configure.ac ./configure.ac
|
|||
AC_CHECK_FUNC([setsid], [], [AC_MSG_ERROR([setsid() function not found.])])
|
||||
AC_CHECK_FUNC([setvbuf], [], [AC_MSG_ERROR([setvbuf() function not found.])])
|
||||
AC_CHECK_FUNC([sigaction], [], [AC_MSG_ERROR([sigaction() function not found.])])
|
||||
@@ -384,18 +375,6 @@
|
||||
dnl from libc)
|
||||
AC_CHECK_LIB(m, pow, [LIBS="$LIBS -lm"])
|
||||
|
||||
-dnl Use pthread library
|
||||
-AX_CHECK_COMPILE_FLAG([-pthread], [
|
||||
- TESTS_CFLAGS="$CFLAGS -pthread"
|
||||
- CFLAGS="$CFLAGS -pthread"
|
||||
- ], [
|
||||
- AC_CHECK_LIB(pthread, pthread_create,
|
||||
- [LIBS="$LIBS -lpthread"
|
||||
- AC_CHECK_HEADER([pthread.h], [], [AC_MSG_ERROR([pthread.h header not found.])])
|
||||
- ],
|
||||
- [AC_MSG_ERROR([libpthread not found])])
|
||||
- ])
|
||||
-
|
||||
dnl Check for all required elements in pthread.h.
|
||||
AC_CHECK_FUNC([pthread_create], [], [AC_MSG_ERROR([pthread_create() function not found.])])
|
||||
AC_CHECK_FUNC([pthread_getspecific], [], [AC_MSG_ERROR([pthread_getspecific() function not found.])])
|
||||
|
|
|
@ -11,7 +11,7 @@
|
|||
ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP $(DEFINES) $(INCLUDES)
|
||||
ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES)
|
||||
-LIBS += -lpthread -ldl -lm
|
||||
+LIBS += -luv -ldl -lm
|
||||
+LIBS += -lpthread -luv -ldl -lm
|
||||
LDDEPS +=
|
||||
LINKCMD = $(CC) -o "$@" $(OBJECTS) $(RESOURCES) $(ALL_LDFLAGS) $(LIBS)
|
||||
define PREBUILDCMDS
|
||||
|
|
|
@ -2,9 +2,8 @@
|
|||
+++ ./Makefile 2022-04-17 19:16:25.686564910 +0000
|
||||
@@ -1,5 +1,5 @@
|
||||
-CFLAGS += -std=c99 -Wall -O2 -D_REENTRANT
|
||||
-LIBS := -lm -lssl -lcrypto -lpthread
|
||||
+CFLAGS += -std=c99 -Wall -D_REENTRANT
|
||||
+LIBS := -lm -lssl -lcrypto
|
||||
LIBS := -lm -lssl -lcrypto -lpthread
|
||||
|
||||
TARGET := $(shell uname -s | tr '[A-Z]' '[a-z]' 2>/dev/null || echo unknown)
|
||||
|
||||
|
|
|
@ -1,23 +0,0 @@
|
|||
diff -ur src-o/configure src/configure
|
||||
--- src-o/configure 2017-07-31 04:44:24.215397674 +0200
|
||||
+++ src/configure 2017-07-31 04:45:19.667222873 +0200
|
||||
@@ -12719,7 +12719,7 @@
|
||||
fi
|
||||
|
||||
|
||||
-THREAD_LIBS=-lpthread
|
||||
+THREAD_LIBS=
|
||||
|
||||
|
||||
|
||||
diff -ur src-o/configure.ac src/configure.ac
|
||||
--- src-o/configure.ac 2017-07-31 04:44:24.215397674 +0200
|
||||
+++ src/configure.ac 2017-07-31 04:44:40.903346135 +0200
|
||||
@@ -113,7 +113,7 @@
|
||||
,
|
||||
[#include <unistd.h>])
|
||||
|
||||
-THREAD_LIBS=-lpthread
|
||||
+THREAD_LIBS=
|
||||
AC_SUBST(THREAD_LIBS)
|
||||
|
|
@ -63,9 +63,8 @@
|
|||
if [ -n $USE_TCL ]
|
||||
then
|
||||
- LIBPOSTFIX=`ls -1 /usr/local/lib/ /usr/lib | grep 'libtcl[0-9]' | grep so | sed -e 's/\.so.*//g' -e 's/libtcl//g' | sort -r | head -1`
|
||||
- TCL_LIB="-ltcl${LIBPOSTFIX} -lm -lpthread"
|
||||
+ LIBPOSTFIX=`ls -1 @TERMUX_PREFIX@/lib | grep 'libtcl[0-9]' | grep so | sed -e 's/\.so.*//g' -e 's/libtcl//g' | sort -r | head -1`
|
||||
+ TCL_LIB="-ltcl${LIBPOSTFIX} -lm"
|
||||
TCL_LIB="-ltcl${LIBPOSTFIX} -lm -lpthread"
|
||||
fi
|
||||
+TCL_INC="-I@TERMUX_PREFIX@/include"
|
||||
|
||||
|
|
|
@ -14,22 +14,3 @@ diff -uNr libfuse-fuse-3.9.1/lib/meson.build libfuse-fuse-3.9.1.mod/lib/meson.bu
|
|||
|
||||
deps = [ thread_dep ]
|
||||
if cfg.get('HAVE_ICONV')
|
||||
@@ -27,9 +23,6 @@
|
||||
if host_machine.system().startswith('netbsd')
|
||||
deps += [ cc.find_library('perfuse'),
|
||||
cc.find_library('puffs') ]
|
||||
-else
|
||||
- # Required for clock_gettime before glibc 2.17
|
||||
- deps += cc.find_library('rt')
|
||||
endif
|
||||
|
||||
fusermount_path = join_paths(get_option('prefix'), get_option('bindir'))
|
||||
@@ -43,7 +36,7 @@
|
||||
+ '/fuse_versionscript' ])
|
||||
|
||||
pkg = import('pkgconfig')
|
||||
-pkg.generate(libraries: [ libfuse, '-lpthread' ],
|
||||
+pkg.generate(libraries: [ libfuse, '-lc' ],
|
||||
libraries_private: '-ldl',
|
||||
version: meson.project_version(),
|
||||
name: 'fuse3',
|
||||
|
|
|
@ -1,10 +0,0 @@
|
|||
--- ./Makefile.orig 2018-01-26 00:05:41.000000000 +0300
|
||||
+++ ./Makefile 2021-02-05 11:28:47.890049844 +0300
|
||||
@@ -10,7 +10,6 @@
|
||||
|
||||
# Internal flags so one can safely override CFLAGS, CPPFLAGS and LDFLAGS
|
||||
INTFLAGS = -std=c99 -I $(SRCDIR)/crypto/tc
|
||||
-LIBS = -lpthread
|
||||
|
||||
ifeq ($(OPENSSL),1)
|
||||
LIBS += -lcrypto
|
|
@ -34,12 +34,6 @@ termux_step_pre_configure() {
|
|||
popd
|
||||
|
||||
LDFLAGS+=" -L${_lib} -l:libgetsubopt.a"
|
||||
|
||||
local f
|
||||
for f in $(find . -name Makefile.in); do
|
||||
sed -i -E 's/ -lpthread($| )/ /g' ${f}
|
||||
sed -i -E 's/ -lrt($| )/ /g' ${f}
|
||||
done
|
||||
}
|
||||
|
||||
termux_step_make_install() {
|
||||
|
|
|
@ -1,26 +0,0 @@
|
|||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index b99e161..5c8d0a3 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -554,7 +554,7 @@ if (UNIX AND NOT APPLE)
|
||||
install(PROGRAMS ${CMAKE_BINARY_DIR}/cantata-remote DESTINATION ${SHARE_INSTALL_PREFIX}/${CMAKE_PROJECT_NAME}/scripts)
|
||||
install(FILES cantata.desktop DESTINATION ${XDG_APPS_INSTALL_DIR})
|
||||
endif ()
|
||||
- target_link_libraries(cantata -lpthread)
|
||||
+ target_link_libraries(cantata)
|
||||
endif ()
|
||||
|
||||
configure_file(config.h.cmake ${CMAKE_BINARY_DIR}/config.h)
|
||||
diff --git a/replaygain/CMakeLists.txt b/replaygain/CMakeLists.txt
|
||||
index ae456ea..864066c 100644
|
||||
--- a/replaygain/CMakeLists.txt
|
||||
+++ b/replaygain/CMakeLists.txt
|
||||
@@ -45,7 +45,7 @@ if (FFMPEG_FOUND OR MPG123_FOUND)
|
||||
endif ()
|
||||
target_link_libraries(cantata-replaygain ${QTCORELIBS})
|
||||
if (UNIX AND NOT APPLE)
|
||||
- target_link_libraries(cantata-replaygain -lpthread)
|
||||
+ target_link_libraries(cantata-replaygain)
|
||||
endif ()
|
||||
endif ()
|
||||
|
|
@ -31,13 +31,10 @@ termux_step_host_build() {
|
|||
}
|
||||
|
||||
termux_step_pre_configure() {
|
||||
sed "s/-lpthread//g" -i configure
|
||||
LDFLAGS+=" $($CC -print-libgcc-file-name)"
|
||||
}
|
||||
|
||||
termux_step_post_configure() {
|
||||
cp -r $TERMUX_PKG_HOSTBUILD_DIR/src/build_tools ./src
|
||||
sed -i 's/ -shared / -Wl,-O1,--as-needed\0/g' ./libtool
|
||||
find . -type f -name Makefile | xargs -n 1 \
|
||||
sed -i "s/-lpthread//g; s/-pthread//g"
|
||||
}
|
||||
|
|
|
@ -1,10 +0,0 @@
|
|||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -523,7 +523,6 @@
|
||||
### --------------------------------------------------------------------
|
||||
set (TeXmacs_Libraries
|
||||
PNG::PNG ZLIB::ZLIB JPEG::JPEG CURL::libcurl Iconv::Iconv
|
||||
- -lpthread
|
||||
)
|
||||
|
||||
if (WIN32)
|
|
@ -1,13 +1,6 @@
|
|||
--- a/configure 2022-03-14 19:04:27.000000000 -0300
|
||||
+++ b/configure 2023-01-14 08:34:29.287718255 -0300
|
||||
@@ -69,13 +71,13 @@
|
||||
CXX="${CXX-${CROSS_COMPILE}g++}"
|
||||
AS="${AS-${CROSS_COMPILE}as}"
|
||||
AR="${AS-${CROSS_COMPILE}ar}"
|
||||
-MAIN_LDLIBS="$LDLIBS -ldl -lm -lpthread"
|
||||
+MAIN_LDLIBS="$LDLIBS -ldl -lm -lc"
|
||||
config_mak="config.mak"
|
||||
|
||||
@@ -69,7 +71,7 @@
|
||||
fail()
|
||||
{
|
||||
echo "$@"
|
||||
|
|
|
@ -156,11 +156,6 @@ termux_step_post_make_install() {
|
|||
"${TERMUX_PREFIX}/opt/qt/cross/bin/qmake" \
|
||||
-spec "${TERMUX_PKG_SRCDIR}/mkspecs/termux-cross"
|
||||
|
||||
## Ensure that no '-lpthread' specified in makefile.
|
||||
sed \
|
||||
-i 's@-lpthread@@g' \
|
||||
Makefile
|
||||
|
||||
## Fix build failure on at least 'i686'.
|
||||
sed \
|
||||
-i 's@$(LINK) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(OBJCOMP) $(LIBS)@$(LINK) -o $(TARGET) $(OBJECTS) $(OBJCOMP) $(LIBS) $(LFLAGS) -lz@g' \
|
||||
|
|
|
@ -1,59 +0,0 @@
|
|||
diff -uNr uget-2.2.1/configure uget-2.2.1.mod/configure
|
||||
--- uget-2.2.1/configure 2018-03-08 16:43:30.000000000 +0200
|
||||
+++ uget-2.2.1.mod/configure 2018-10-05 22:03:29.217753571 +0300
|
||||
@@ -6315,55 +6315,6 @@
|
||||
|
||||
fi
|
||||
|
||||
-## ----------------
|
||||
-## pthread
|
||||
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_create in -lpthread" >&5
|
||||
-$as_echo_n "checking for pthread_create in -lpthread... " >&6; }
|
||||
-if ${ac_cv_lib_pthread_pthread_create+:} false; then :
|
||||
- $as_echo_n "(cached) " >&6
|
||||
-else
|
||||
- ac_check_lib_save_LIBS=$LIBS
|
||||
-LIBS="-lpthread $LIBS"
|
||||
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
||||
-/* end confdefs.h. */
|
||||
-
|
||||
-/* Override any GCC internal prototype to avoid an error.
|
||||
- Use char because int might match the return type of a GCC
|
||||
- builtin and then its argument prototype would still apply. */
|
||||
-#ifdef __cplusplus
|
||||
-extern "C"
|
||||
-#endif
|
||||
-char pthread_create ();
|
||||
-int
|
||||
-main ()
|
||||
-{
|
||||
-return pthread_create ();
|
||||
- ;
|
||||
- return 0;
|
||||
-}
|
||||
-_ACEOF
|
||||
-if ac_fn_c_try_link "$LINENO"; then :
|
||||
- ac_cv_lib_pthread_pthread_create=yes
|
||||
-else
|
||||
- ac_cv_lib_pthread_pthread_create=no
|
||||
-fi
|
||||
-rm -f core conftest.err conftest.$ac_objext \
|
||||
- conftest$ac_exeext conftest.$ac_ext
|
||||
-LIBS=$ac_check_lib_save_LIBS
|
||||
-fi
|
||||
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pthread_pthread_create" >&5
|
||||
-$as_echo "$ac_cv_lib_pthread_pthread_create" >&6; }
|
||||
-if test "x$ac_cv_lib_pthread_pthread_create" = xyes; then :
|
||||
- cat >>confdefs.h <<_ACEOF
|
||||
-#define HAVE_LIBPTHREAD 1
|
||||
-_ACEOF
|
||||
-
|
||||
- LIBS="-lpthread $LIBS"
|
||||
-
|
||||
-else
|
||||
- as_fn_error $? "required library pthread missing" "$LINENO" 5
|
||||
-fi
|
||||
-
|
||||
PTHREAD_CFLAGS="-pthread"
|
||||
PTHREAD_LIBS="-pthread"
|
||||
|
|
@ -1,70 +0,0 @@
|
|||
diff -uNr xrdp-0.9.8/common/Makefile.am xrdp-0.9.8.mod/common/Makefile.am
|
||||
--- xrdp-0.9.8/common/Makefile.am 2018-03-27 17:15:16.000000000 +0300
|
||||
+++ xrdp-0.9.8.mod/common/Makefile.am 2018-12-27 15:41:13.808966307 +0200
|
||||
@@ -58,6 +58,5 @@
|
||||
$(PIXMAN_SOURCES)
|
||||
|
||||
libcommon_la_LIBADD = \
|
||||
- -lpthread \
|
||||
$(OPENSSL_LIBS) \
|
||||
$(DLOPEN_LIBS)
|
||||
diff -uNr xrdp-0.9.8/common/Makefile.in xrdp-0.9.8.mod/common/Makefile.in
|
||||
--- xrdp-0.9.8/common/Makefile.in 2018-09-25 09:19:19.000000000 +0300
|
||||
+++ xrdp-0.9.8.mod/common/Makefile.in 2018-12-27 15:41:13.815632972 +0200
|
||||
@@ -417,7 +417,6 @@
|
||||
$(PIXMAN_SOURCES)
|
||||
|
||||
libcommon_la_LIBADD = \
|
||||
- -lpthread \
|
||||
$(OPENSSL_LIBS) \
|
||||
$(DLOPEN_LIBS)
|
||||
|
||||
diff -uNr xrdp-0.9.8/sesman/libscp/Makefile.am xrdp-0.9.8.mod/sesman/libscp/Makefile.am
|
||||
--- xrdp-0.9.8/sesman/libscp/Makefile.am 2018-03-26 09:14:14.000000000 +0300
|
||||
+++ xrdp-0.9.8.mod/sesman/libscp/Makefile.am 2018-12-27 15:41:13.815632972 +0200
|
||||
@@ -42,5 +42,4 @@
|
||||
libscp_vX.h
|
||||
|
||||
libscp_la_LIBADD = \
|
||||
- $(top_builddir)/common/libcommon.la \
|
||||
- -lpthread
|
||||
+ $(top_builddir)/common/libcommon.la
|
||||
diff -uNr xrdp-0.9.8/sesman/libscp/Makefile.in xrdp-0.9.8.mod/sesman/libscp/Makefile.in
|
||||
--- xrdp-0.9.8/sesman/libscp/Makefile.in 2018-09-25 09:19:20.000000000 +0300
|
||||
+++ xrdp-0.9.8.mod/sesman/libscp/Makefile.in 2018-12-27 15:41:13.822299639 +0200
|
||||
@@ -397,8 +397,7 @@
|
||||
libscp_vX.h
|
||||
|
||||
libscp_la_LIBADD = \
|
||||
- $(top_builddir)/common/libcommon.la \
|
||||
- -lpthread
|
||||
+ $(top_builddir)/common/libcommon.la
|
||||
|
||||
all: all-am
|
||||
|
||||
diff -uNr xrdp-0.9.8/sesman/Makefile.am xrdp-0.9.8.mod/sesman/Makefile.am
|
||||
--- xrdp-0.9.8/sesman/Makefile.am 2018-09-18 07:21:13.000000000 +0300
|
||||
+++ xrdp-0.9.8.mod/sesman/Makefile.am 2018-12-27 15:41:13.825632971 +0200
|
||||
@@ -70,8 +70,7 @@
|
||||
xrdp_sesman_LDADD = \
|
||||
$(top_builddir)/common/libcommon.la \
|
||||
$(top_builddir)/sesman/libscp/libscp.la \
|
||||
- $(AUTH_LIB) \
|
||||
- -lpthread
|
||||
+ $(AUTH_LIB)
|
||||
|
||||
sesmansysconfdir=$(sysconfdir)/xrdp
|
||||
|
||||
diff -uNr xrdp-0.9.8/sesman/Makefile.in xrdp-0.9.8.mod/sesman/Makefile.in
|
||||
--- xrdp-0.9.8/sesman/Makefile.in 2018-09-25 09:19:20.000000000 +0300
|
||||
+++ xrdp-0.9.8.mod/sesman/Makefile.in 2018-12-27 15:41:13.828966305 +0200
|
||||
@@ -474,8 +474,7 @@
|
||||
xrdp_sesman_LDADD = \
|
||||
$(top_builddir)/common/libcommon.la \
|
||||
$(top_builddir)/sesman/libscp/libscp.la \
|
||||
- $(AUTH_LIB) \
|
||||
- -lpthread
|
||||
+ $(AUTH_LIB)
|
||||
|
||||
sesmansysconfdir = $(sysconfdir)/xrdp
|
||||
SUBST_VARS = sed \
|
Loading…
Reference in New Issue