-
Notifications
You must be signed in to change notification settings - Fork 6.7k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'upstream/master' into fix_single_config2
# Conflicts: # ports/libcanberra/portfile.cmake # versions/l-/libcanberra.json
- Loading branch information
Showing
76 changed files
with
542 additions
and
226 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,13 @@ | ||
| diff --git a/CMake/CatchMiscFunctions.cmake b/CMake/CatchMiscFunctions.cmake | ||
| index be76d8380..5a068d088 100644 | ||
| --- a/CMake/CatchMiscFunctions.cmake | ||
| +++ b/CMake/CatchMiscFunctions.cmake | ||
| @@ -13,7 +13,7 @@ function(add_cxx_flag_if_supported_to_targets flagname targets) | ||
|
|
||
| if (HAVE_FLAG_${flag_identifier}) | ||
| foreach(target ${targets}) | ||
| - target_compile_options(${target} PUBLIC ${flagname}) | ||
| + target_compile_options(${target} PRIVATE ${flagname}) | ||
| endforeach() | ||
| endif() | ||
| endfunction() |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,20 @@ | ||
| diff --git a/gdk-pixbuf/meson.build b/gdk-pixbuf/meson.build | ||
| index 54ff9dd..27f8512 100644 | ||
| --- a/gdk-pixbuf/meson.build | ||
| +++ b/gdk-pixbuf/meson.build | ||
| @@ -348,7 +348,14 @@ foreach bin: gdkpixbuf_bin | ||
| set_variable(bin_name.underscorify(), bin) | ||
| endforeach | ||
|
|
||
| -if not meson.is_cross_build() | ||
| +if dynamic_loaders.length() == 0 | ||
| + # skip tool invocation | ||
| + cmake = find_program('cmake', required : true) | ||
| + loaders_cache = custom_target('loaders.cache', output: 'loaders.cache', capture: true, | ||
| + command: [ cmake, '-E', 'echo', '# No dynamic loaders enabled at build time' ], | ||
| + build_by_default: true) | ||
| + loaders_dep = declare_dependency(sources: [ loaders_cache ]) | ||
| +elif not meson.is_cross_build() | ||
| # The 'loaders.cache' used for testing, so we don't accidentally | ||
| # load the installed cache; we always build it by default | ||
| loaders_cache = custom_target('loaders.cache', |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,32 @@ | ||
| From 46ae9af513ad669ca4e075e5d63f6eb77e9ad2b1 Mon Sep 17 00:00:00 2001 | ||
| From: 06393993 <[email protected]> | ||
| Date: Mon, 3 Oct 2022 01:41:24 -0700 | ||
| Subject: [PATCH] Fix static build on Linux (#635) | ||
|
|
||
| On Linux, it is very likely that a GNU libtool is used, and different | ||
| parameters are needed for libtool to combine libraries. | ||
| --- | ||
| CMakeLists.txt | 8 +++++++- | ||
| 1 file changed, 7 insertions(+), 1 deletion(-) | ||
|
|
||
| diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
| index d19e7dbc2..2b0e31751 100644 | ||
| --- a/CMakeLists.txt | ||
| +++ b/CMakeLists.txt | ||
| @@ -830,9 +830,15 @@ set_property(TARGET ${ASTC_LIB_TARGET} PROPERTY POSITION_INDEPENDENT_CODE ON) | ||
| if(KTX_FEATURE_STATIC_LIBRARY AND NOT WIN32 AND NOT EMSCRIPTEN) | ||
| # Make a single static library to simplify linking. | ||
| add_dependencies(ktx ${ASTC_LIB_TARGET}) | ||
| + set(LIBTOOL_ARGS) | ||
| + if(LINUX) | ||
| + set(LIBTOOL_ARGS ${LIBTOOL_ARGS} --mode=link --tag=CC cc) | ||
| + endif() | ||
| + set(LIBTOOL_ARGS ${LIBTOOL_ARGS} -static -o | ||
| + $<TARGET_FILE:ktx> $<TARGET_FILE:ktx> $<TARGET_FILE:${ASTC_LIB_TARGET}>) | ||
| add_custom_command( TARGET ktx | ||
| POST_BUILD | ||
| - COMMAND libtool -static -o $<TARGET_FILE:ktx> $<TARGET_FILE:ktx> $<TARGET_FILE:${ASTC_LIB_TARGET}> | ||
| + COMMAND libtool ${LIBTOOL_ARGS} | ||
| ) | ||
|
|
||
| # Don't know libtool equivalent on Windows or Emscripten. Applications |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,14 @@ | ||
| diff --git a/src/sound-theme-spec.c b/src/sound-theme-spec.c | ||
| index 32affd0..371e380 100644 | ||
| --- a/src/sound-theme-spec.c | ||
| +++ b/src/sound-theme-spec.c | ||
| @@ -28,6 +28,9 @@ | ||
| #include <unistd.h> | ||
|
|
||
| #include <locale.h> | ||
| +#ifndef LC_MESSAGES | ||
| +#include <libintl.h> | ||
| +#endif | ||
|
|
||
| #include "sound-theme-spec.h" | ||
| #include "malloc.h" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,29 @@ | ||
| diff --git a/configure.ac b/configure.ac | ||
| index f68602d..a4e24b3 100644 | ||
| --- a/configure.ac | ||
| +++ b/configure.ac | ||
| @@ -140,8 +140,12 @@ dnl We don't need any special variable for this though, since the user | ||
| dnl can give the proper place to find libltdl through the standard | ||
| dnl variables like LDFLAGS and CPPFLAGS. | ||
|
|
||
| +LTDL_INIT | ||
| +if test -n "$LTDL_LDFLAGS"; then | ||
| + LDFLAGS="$LDFLAGS $LTDL_LDFLAGS" | ||
| +fi | ||
| AC_CHECK_HEADER([ltdl.h], | ||
| - [AC_CHECK_LIB([ltdl], [lt_dladvise_init], [LIBLTDL=-lltdl], [LIBLTDL=])], | ||
| + [AC_CHECK_LIB([ltdl], [lt_dladvise_init], [LIBLTDL="-lltdl $LTDL_LDFLAGS $lt_cv_dlopen_libs"], [LIBLTDL=])], | ||
| [LIBLTDL=]) | ||
|
|
||
| AS_IF([test "x$LIBLTDL" = "x"], | ||
| diff --git a/libcanberra.pc.in b/libcanberra.pc.in | ||
| index 0a5c7a1..a6a989b 100644 | ||
| --- a/libcanberra.pc.in | ||
| +++ b/libcanberra.pc.in | ||
| @@ -7,5 +7,6 @@ Name: libcanberra | ||
| Description: Event Sound API | ||
| Version: @PACKAGE_VERSION@ | ||
| Libs: -L${libdir} -lcanberra @PTHREAD_LIBS@ | ||
| +Libs.private: @LIBLTDL@ | ||
| Cflags: -D_REENTRANT -I${includedir} | ||
| Requires: |
Oops, something went wrong.