diff options
Diffstat (limited to 'graphics/GraphicsMagick/files/patch-configure')
| -rw-r--r-- | graphics/GraphicsMagick/files/patch-configure | 28 |
1 files changed, 8 insertions, 20 deletions
diff --git a/graphics/GraphicsMagick/files/patch-configure b/graphics/GraphicsMagick/files/patch-configure index 01011aea16aa..7c7286726db9 100644 --- a/graphics/GraphicsMagick/files/patch-configure +++ b/graphics/GraphicsMagick/files/patch-configure @@ -1,14 +1,14 @@ ---- configure.orig 2015-02-28 20:53:46 UTC +--- configure.orig 2024-03-22 13:04:33 UTC +++ configure -@@ -13277,7 +13277,6 @@ fi +@@ -13400,7 +13400,6 @@ fi # FreeBSD 3 and greater uses gcc -shared to do shared libraries. - freebsd* | dragonfly*) + freebsd* | dragonfly* | midnightbsd*) archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' - hardcode_libdir_flag_spec='-R$libdir' hardcode_direct=yes hardcode_shlibpath_var=no ;; -@@ -24497,60 +24496,6 @@ else +@@ -25496,61 +25495,6 @@ else X_CFLAGS="$X_CFLAGS -I$x_includes" fi @@ -66,23 +66,11 @@ - ac_c_werror_flag=$ac_xsave_c_werror_flag - LIBS=$ac_xsave_LIBS - fi - +- # Check for system-dependent libraries X programs must link with. # Do this before checking for the system-independent R6 libraries -@@ -27336,10 +27281,8 @@ $as_echo "no -- some components failed test" >&6; } - $as_echo "no -- some components failed test" >&6; } - have_jxl='no (failed tests)' - else -- # JXL is a C++ Lib so requires linking with stdc++. -- # TODO: A better solution would be to tell automake to do any linking with -- # c++, but I can't figure out a way to get this working. -- LIB_JXL='-ljxl -ljxl_threads -lhwy -lbrotlidec -lbrotlienc -lstdc++' -+ # TODO: use pkg-config -+ LIB_JXL='-ljxl -ljxl_threads' - LIBS="$LIB_JXL $LIBS" - - $as_echo "#define HasJXL 1" >>confdefs.h -@@ -27703,7 +27649,7 @@ fi + # (-lICE), since we may need -lsocket or whatever for X linking. +@@ -30112,7 +30056,7 @@ done # # Subdirectory under lib to place GraphicsMagick lib files @@ -91,7 +79,7 @@ cat >>confdefs.h <<_ACEOF #define MagickLibSubdir "$MagickLibSubdir" -@@ -27807,7 +27753,7 @@ _ACEOF +@@ -30216,7 +30160,7 @@ _ACEOF # # Path to GraphicsMagick share files |