pyrox.dev / nixpkgs
lol
fork atom

singular: use older autoconf macro to unbreak aarch64

authored by

Mauricio Collares and committed by
Masanori Ogino cd7cf594 aebef170

+200
unified split
+6
pkgs/applications/science/math/singular/default.nix
··· 51 51 patches = [ 52 52 # add aarch64 support to cpu-check.m4. copied from redhat. 53 53 ./redhat-aarch64.patch 54 + 55 + # the newest version of ax-prog-cc-for-build.m4 seems to trigger 56 + # linker errors. see 57 + # https://github.com/alsa-project/alsa-firmware/issues/3 for a 58 + # related issue. 59 + ./use-older-ax-prog-cc-for-build.patch 54 60 ] ++ lib.optionals enableDocs [ 55 61 # singular supports building without 4ti2, bertini, normaliz or 56 62 # topcom just fine, but the docbuilding does not skip manual pages
+194
pkgs/applications/science/math/singular/use-older-ax-prog-cc-for-build.patch
··· 1 + diff --git a/m4/ax_prog_cc_for_build.m4 b/m4/ax_prog_cc_for_build.m4 2 + index f7410d74b..12cb005a5 100644 3 + --- a/m4/ax_prog_cc_for_build.m4 4 + +++ b/m4/ax_prog_cc_for_build.m4 5 + @@ -32,35 +32,31 @@ 6 + # and this notice are preserved. This file is offered as-is, without any 7 + # warranty. 8 + 9 + -#serial 18 10 + +#serial 9 11 + 12 + AU_ALIAS([AC_PROG_CC_FOR_BUILD], [AX_PROG_CC_FOR_BUILD]) 13 + AC_DEFUN([AX_PROG_CC_FOR_BUILD], [dnl 14 + AC_REQUIRE([AC_PROG_CC])dnl 15 + AC_REQUIRE([AC_PROG_CPP])dnl 16 + -AC_REQUIRE([AC_CANONICAL_BUILD])dnl 17 + +AC_REQUIRE([AC_EXEEXT])dnl 18 + +AC_REQUIRE([AC_CANONICAL_HOST])dnl 19 + 20 + dnl Use the standard macros, but make them use other variable names 21 + dnl 22 + pushdef([ac_cv_prog_CPP], ac_cv_build_prog_CPP)dnl 23 + -pushdef([ac_cv_prog_cc_c89], ac_cv_build_prog_cc_c89)dnl 24 + pushdef([ac_cv_prog_gcc], ac_cv_build_prog_gcc)dnl 25 + pushdef([ac_cv_prog_cc_works], ac_cv_build_prog_cc_works)dnl 26 + pushdef([ac_cv_prog_cc_cross], ac_cv_build_prog_cc_cross)dnl 27 + pushdef([ac_cv_prog_cc_g], ac_cv_build_prog_cc_g)dnl 28 + -pushdef([ac_cv_c_compiler_gnu], ac_cv_build_c_compiler_gnu)dnl 29 + pushdef([ac_cv_exeext], ac_cv_build_exeext)dnl 30 + pushdef([ac_cv_objext], ac_cv_build_objext)dnl 31 + pushdef([ac_exeext], ac_build_exeext)dnl 32 + pushdef([ac_objext], ac_build_objext)dnl 33 + pushdef([CC], CC_FOR_BUILD)dnl 34 + pushdef([CPP], CPP_FOR_BUILD)dnl 35 + -pushdef([GCC], GCC_FOR_BUILD)dnl 36 + pushdef([CFLAGS], CFLAGS_FOR_BUILD)dnl 37 + pushdef([CPPFLAGS], CPPFLAGS_FOR_BUILD)dnl 38 + -pushdef([EXEEXT], BUILD_EXEEXT)dnl 39 + pushdef([LDFLAGS], LDFLAGS_FOR_BUILD)dnl 40 + -pushdef([OBJEXT], BUILD_OBJEXT)dnl 41 + pushdef([host], build)dnl 42 + pushdef([host_alias], build_alias)dnl 43 + pushdef([host_cpu], build_cpu)dnl 44 + @@ -71,29 +67,27 @@ pushdef([ac_cv_host_alias], ac_cv_build_alias)dnl 45 + pushdef([ac_cv_host_cpu], ac_cv_build_cpu)dnl 46 + pushdef([ac_cv_host_vendor], ac_cv_build_vendor)dnl 47 + pushdef([ac_cv_host_os], ac_cv_build_os)dnl 48 + -pushdef([ac_tool_prefix], ac_build_tool_prefix)dnl 49 + -pushdef([am_cv_CC_dependencies_compiler_type], am_cv_build_CC_dependencies_compiler_type)dnl 50 + -pushdef([am_cv_prog_cc_c_o], am_cv_build_prog_cc_c_o)dnl 51 + -pushdef([cross_compiling], cross_compiling_build)dnl 52 + +pushdef([ac_cpp], ac_build_cpp)dnl 53 + +pushdef([ac_compile], ac_build_compile)dnl 54 + +pushdef([ac_link], ac_build_link)dnl 55 + 56 + -cross_compiling_build=no 57 + +save_cross_compiling=$cross_compiling 58 + +save_ac_tool_prefix=$ac_tool_prefix 59 + +cross_compiling=no 60 + +ac_tool_prefix= 61 + 62 + -ac_build_tool_prefix= 63 + -AS_IF([test -n "$build"], [ac_build_tool_prefix="$build-"], 64 + - [test -n "$build_alias"],[ac_build_tool_prefix="$build_alias-"]) 65 + - 66 + -AC_LANG_PUSH([C]) 67 + AC_PROG_CC 68 + -_AC_COMPILER_EXEEXT 69 + -_AC_COMPILER_OBJEXT 70 + AC_PROG_CPP 71 + +AC_EXEEXT 72 + + 73 + +ac_tool_prefix=$save_ac_tool_prefix 74 + +cross_compiling=$save_cross_compiling 75 + 76 + dnl Restore the old definitions 77 + dnl 78 + -popdef([cross_compiling])dnl 79 + -popdef([am_cv_prog_cc_c_o])dnl 80 + -popdef([am_cv_CC_dependencies_compiler_type])dnl 81 + -popdef([ac_tool_prefix])dnl 82 + +popdef([ac_link])dnl 83 + +popdef([ac_compile])dnl 84 + +popdef([ac_cpp])dnl 85 + popdef([ac_cv_host_os])dnl 86 + popdef([ac_cv_host_vendor])dnl 87 + popdef([ac_cv_host_cpu])dnl 88 + @@ -104,33 +98,25 @@ popdef([host_vendor])dnl 89 + popdef([host_cpu])dnl 90 + popdef([host_alias])dnl 91 + popdef([host])dnl 92 + -popdef([OBJEXT])dnl 93 + popdef([LDFLAGS])dnl 94 + -popdef([EXEEXT])dnl 95 + popdef([CPPFLAGS])dnl 96 + popdef([CFLAGS])dnl 97 + -popdef([GCC])dnl 98 + popdef([CPP])dnl 99 + popdef([CC])dnl 100 + popdef([ac_objext])dnl 101 + popdef([ac_exeext])dnl 102 + popdef([ac_cv_objext])dnl 103 + popdef([ac_cv_exeext])dnl 104 + -popdef([ac_cv_c_compiler_gnu])dnl 105 + popdef([ac_cv_prog_cc_g])dnl 106 + popdef([ac_cv_prog_cc_cross])dnl 107 + popdef([ac_cv_prog_cc_works])dnl 108 + -popdef([ac_cv_prog_cc_c89])dnl 109 + popdef([ac_cv_prog_gcc])dnl 110 + popdef([ac_cv_prog_CPP])dnl 111 + 112 + -dnl restore global variables ac_ext, ac_cpp, ac_compile, 113 + -dnl ac_link, ac_compiler_gnu (dependant on the current 114 + -dnl language after popping): 115 + -AC_LANG_POP([C]) 116 + - 117 + dnl Finally, set Makefile variables 118 + dnl 119 + +BUILD_EXEEXT=$ac_build_exeext 120 + +BUILD_OBJEXT=$ac_build_objext 121 + AC_SUBST(BUILD_EXEEXT)dnl 122 + AC_SUBST(BUILD_OBJEXT)dnl 123 + AC_SUBST([CFLAGS_FOR_BUILD])dnl 124 + diff --git a/m4/ax_prog_cxx_for_build.m4 b/m4/ax_prog_cxx_for_build.m4 125 + index 4d976769f..17c19a89f 100644 126 + --- a/m4/ax_prog_cxx_for_build.m4 127 + +++ b/m4/ax_prog_cxx_for_build.m4 128 + @@ -31,7 +31,7 @@ 129 + # and this notice are preserved. This file is offered as-is, without any 130 + # warranty. 131 + 132 + -#serial 4 133 + +#serial 3 134 + 135 + AU_ALIAS([AC_PROG_CXX_FOR_BUILD], [AX_PROG_CXX_FOR_BUILD]) 136 + AC_DEFUN([AX_PROG_CXX_FOR_BUILD], [dnl 137 + @@ -49,7 +49,6 @@ pushdef([ac_cv_prog_cxx_cross], ac_cv_build_prog_cxx_cross)dnl 138 + pushdef([ac_cv_prog_cxx_g], ac_cv_build_prog_cxx_g)dnl 139 + pushdef([CXX], CXX_FOR_BUILD)dnl 140 + pushdef([CXXCPP], CXXCPP_FOR_BUILD)dnl 141 + -pushdef([GXX], GXX_FOR_BUILD)dnl 142 + pushdef([CXXFLAGS], CXXFLAGS_FOR_BUILD)dnl 143 + pushdef([CPPFLAGS], CPPFLAGS_FOR_BUILD)dnl 144 + pushdef([CXXCPPFLAGS], CXXCPPFLAGS_FOR_BUILD)dnl 145 + @@ -63,25 +62,26 @@ pushdef([ac_cv_host_alias], ac_cv_build_alias)dnl 146 + pushdef([ac_cv_host_cpu], ac_cv_build_cpu)dnl 147 + pushdef([ac_cv_host_vendor], ac_cv_build_vendor)dnl 148 + pushdef([ac_cv_host_os], ac_cv_build_os)dnl 149 + -pushdef([ac_tool_prefix], ac_build_tool_prefix)dnl 150 + -pushdef([am_cv_CXX_dependencies_compiler_type], am_cv_build_CXX_dependencies_compiler_type)dnl 151 + -pushdef([cross_compiling], cross_compiling_build)dnl 152 + +pushdef([ac_cxxcpp], ac_build_cxxcpp)dnl 153 + +pushdef([ac_compile], ac_build_compile)dnl 154 + +pushdef([ac_link], ac_build_link)dnl 155 + 156 + -cross_compiling_build=no 157 + +save_cross_compiling=$cross_compiling 158 + +save_ac_tool_prefix=$ac_tool_prefix 159 + +cross_compiling=no 160 + +ac_tool_prefix= 161 + 162 + -ac_build_tool_prefix= 163 + -AS_IF([test -n "$build"], [ac_build_tool_prefix="$build-"], 164 + - [test -n "$build_alias"],[ac_build_tool_prefix="$build_alias-"]) 165 + - 166 + -AC_LANG_PUSH([C++]) 167 + AC_PROG_CXX 168 + AC_PROG_CXXCPP 169 + 170 + +ac_tool_prefix=$save_ac_tool_prefix 171 + +cross_compiling=$save_cross_compiling 172 + + 173 + dnl Restore the old definitions 174 + dnl 175 + -popdef([cross_compiling])dnl 176 + -popdef([am_cv_CXX_dependencies_compiler_type])dnl 177 + -popdef([ac_tool_prefix])dnl 178 + +popdef([ac_link])dnl 179 + +popdef([ac_compile])dnl 180 + +popdef([ac_cxxcpp])dnl 181 + popdef([ac_cv_host_os])dnl 182 + popdef([ac_cv_host_vendor])dnl 183 + popdef([ac_cv_host_cpu])dnl 184 + @@ -103,10 +103,6 @@ popdef([ac_cv_prog_cxx_works])dnl 185 + popdef([ac_cv_prog_gxx])dnl 186 + popdef([ac_cv_prog_CXXCPP])dnl 187 + 188 + -dnl restore global variables (dependant on the current 189 + -dnl language after popping): 190 + -AC_LANG_POP([C++]) 191 + - 192 + dnl Finally, set Makefile variables 193 + dnl 194 + AC_SUBST([CXXFLAGS_FOR_BUILD])dnl