diff options
author | Alyssa Ross <hi@alyssa.is> | 2022-01-03 23:55:00 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2022-02-19 11:03:39 +0000 |
commit | f4cf97a04cd5d0b86aa46baec9fb228a8f671c03 (patch) | |
tree | 28192415ff39a661d0001563bf81cc93fa25d16d /nixpkgs/pkgs/development/libraries/libsbsms/configure.patch | |
parent | f8422837c9bde058e8f2de37702e7e94b2226040 (diff) | |
parent | 18c84ea816348e2a098390101b92d1e39a9dbd45 (diff) | |
download | nixlib-f4cf97a04cd5d0b86aa46baec9fb228a8f671c03.tar nixlib-f4cf97a04cd5d0b86aa46baec9fb228a8f671c03.tar.gz nixlib-f4cf97a04cd5d0b86aa46baec9fb228a8f671c03.tar.bz2 nixlib-f4cf97a04cd5d0b86aa46baec9fb228a8f671c03.tar.lz nixlib-f4cf97a04cd5d0b86aa46baec9fb228a8f671c03.tar.xz nixlib-f4cf97a04cd5d0b86aa46baec9fb228a8f671c03.tar.zst nixlib-f4cf97a04cd5d0b86aa46baec9fb228a8f671c03.zip |
Merge commit '18c84ea816348e2a098390101b92d1e39a9dbd45'
Conflicts: nixpkgs/nixos/modules/misc/documentation.nix nixpkgs/pkgs/applications/networking/browsers/firefox/packages.nix nixpkgs/pkgs/applications/window-managers/sway/default.nix nixpkgs/pkgs/build-support/rust/build-rust-package/default.nix nixpkgs/pkgs/development/go-modules/generic/default.nix nixpkgs/pkgs/development/interpreters/ruby/default.nix nixpkgs/pkgs/development/interpreters/ruby/patchsets.nix nixpkgs/pkgs/development/libraries/boehm-gc/7.6.6.nix nixpkgs/pkgs/development/python-modules/django-mailman3/default.nix nixpkgs/pkgs/servers/mail/mailman/web.nix nixpkgs/pkgs/top-level/aliases.nix nixpkgs/pkgs/top-level/all-packages.nix nixpkgs/pkgs/top-level/impure.nix
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/libsbsms/configure.patch')
-rw-r--r-- | nixpkgs/pkgs/development/libraries/libsbsms/configure.patch | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/nixpkgs/pkgs/development/libraries/libsbsms/configure.patch b/nixpkgs/pkgs/development/libraries/libsbsms/configure.patch new file mode 100644 index 000000000000..cfb9d2d08e6b --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/libsbsms/configure.patch @@ -0,0 +1,22 @@ +diff --git a/configure b/configure +index 3d40335..faa3ac6 100755 +--- a/configure ++++ b/configure +@@ -14722,7 +14722,7 @@ if ${ax_cv_cxx_flags__msse+:} false; then : + else + + ax_save_FLAGS=$CXXFLAGS +- CXXFLAGS="-msse" ++ CXXFLAGS="@msse@" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + +@@ -14747,7 +14747,7 @@ eval ax_check_compiler_flags=$ax_cv_cxx_flags__msse + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_check_compiler_flags" >&5 + $as_echo "$ax_check_compiler_flags" >&6; } + if test "x$ax_check_compiler_flags" = xyes; then +- SBSMS_CFLAGS="$SBSMS_CFLAGS -msse" ++ SBSMS_CFLAGS="$SBSMS_CFLAGS @msse@" + else + as_fn_error $? "Need a version of gcc with -msse" "$LINENO" 5 + fi |