diff -ur curl-7.26.0/configure misc/build/curl-7.26.0/configure --- curl-7.26.0/configure 2012-07-02 13:28:51.327994494 +0200 +++ misc/build/curl-7.26.0/configure 2012-07-02 13:32:38.754006822 +0200 @@ -2693,8 +2693,8 @@ ac_ext=c ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compile='$CC -c $ADDCFLAGS $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $ADDCFLAGS $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu @@ -3855,8 +3855,8 @@ ac_save_CPPFLAGS="$CPPFLAGS" ac_ext=c ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compile='$CC -c $ADDCFLAGS $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $ADDCFLAGS $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. @@ -4506,15 +4506,15 @@ CFLAGS=$ac_save_CFLAGS elif test $ac_cv_prog_cc_g = yes; then if test "$GCC" = yes; then - CFLAGS="-g -O2" + CFLAGS="$ADDCFLAGS -g -O2" else - CFLAGS="-g" + CFLAGS="$ADDCFLAGS -g" fi else if test "$GCC" = yes; then - CFLAGS="-O2" + CFLAGS="$ADDCFLAGS -O2" else - CFLAGS= + CFLAGS="$ADDCFLAGS" fi fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5 diff -ur curl-7.26.0/lib/setup.h misc/build/curl-7.26.0/lib/setup.h --- curl-7.26.0/lib/setup.h 2012-07-02 13:28:51.322994494 +0200 +++ misc/build/curl-7.26.0/lib/setup.h 2012-07-02 13:41:15.652034841 +0200 @@ -231,6 +231,7 @@ # include # ifdef HAVE_WS2TCPIP_H # include +# include # endif # else # ifdef HAVE_WINSOCK_H diff -ur curl-7.26.0/ltmain.sh misc/build/curl-7.26.0/ltmain.sh --- curl-7.26.0/ltmain.sh 2012-07-02 13:28:51.298994493 +0200 +++ misc/build/curl-7.26.0/ltmain.sh 2012-07-02 13:42:46.511039769 +0200 @@ -7334,13 +7334,13 @@ # case $version_type in # correct linux to gnu/linux during the next big refactor - darwin|linux|osf|windows|none) + darwin|linux|osf|windows|freebsd-aout|freebsd-elf|none) func_arith $number_major + $number_minor current=$func_arith_result age="$number_minor" revision="$number_revision" ;; - freebsd-aout|freebsd-elf|qnx|sunos) + qnx|sunos) current="$number_major" revision="$number_minor" age="0" @@ -7420,8 +7420,8 @@ ;; freebsd-elf) - major=".$current" - versuffix=".$current" + major=.`expr $current - $age` + versuffix="$major" ;; irix | nonstopux) collabora/cp-4.1 LibreOffice 核心代码仓库文档基金会
summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2016-11-17Fix tdf#103855 add language codes and names to language lists from extensionsMartin Hosken
2016-08-29name it Hungarian Rovas, tdf#97406 follow-upEike Rathke
2016-08-29Resolves: tdf#95162 Hung is RTL/CTLEike Rathke
2016-08-26add Old Hungarian (Hungarian Rovas) [hu-Hung-HU] to language list, tdf#97406Eike Rathke
2016-08-16Resolves: tdf#101540 add Silesian [szl-PL] to language listEike Rathke
2016-07-27improve passstuffbyref return analysisNoel Grandin
2016-07-04Fix some spelling errors in comments and stringsOtto Kekäläinen
2016-05-10Insert explicit "break" when falling through to empty next caseStephan Bergmann
2016-04-25add English (Mauritius) [en-MU] and French (Mauritius) [fr-MU], tdf#99372Eike Rathke
2016-04-21handle 'C' locale in simpleExtract()Eike Rathke
2016-04-21also exclude the "specific English" table from mapping to LanguageTagEike Rathke
2016-04-20explicitly map 'C' locale and other known definitions to LanguageTagEike Rathke
2016-04-14Resolves: tdf#73973 it's [crk-Latn-CA] and [crk-Cans-CA]Eike Rathke
2016-04-04loplugin:constantparam in i18nlangtagNoel Grandin
2016-03-03loplugin:unuseddefaultparams variousNoel Grandin
2016-02-17use consistent #define checks for the Windows platformNoel Grandin
2016-02-09Remove excess newlinesChris Sherlock
2016-01-27tdf#97386 add Apatani [apt-IN] to language listEike Rathke
2016-01-22tdf#97315 add Basque [eu-ES] and map [eu] to [eu-ES]Eike Rathke
2016-01-08tdf#96647 add Interlingue Occidental [ie] to language listEike Rathke
2015-11-24cppcheck: noExplicitConstructorCaolán McNamara
2015-11-10loplugin:nullptr (automatic rewrite)Stephan Bergmann
2015-10-19com::sun::star->css in i18nlangtagNoel Grandin
2015-10-14Pass ENABLE_LIBLANGTAG into code via config_liblangtag.hStephan Bergmann
2015-10-14Fix various warnings in --disable-liblangtag codeStephan Bergmann
2015-09-14add English (Botswana) [en-BW] 0x9809 to language list, tdf#94207 preparationEike Rathke
2015-08-25tdf#93468 add Arpitan (Switzerland) [frp-CH]Eike Rathke
2015-08-23adapt mapping lines to current isolang.cxx entriesEike Rathke
2015-08-23new list of [MS-LCID] rev. 7.0 2015-06-30Eike Rathke
2015-08-23Russian Moldova ru-MD, mo-MD merged with ro-MDEike Rathke
2015-08-22disentangle the Dzongkha mess a littleEike Rathke
2015-08-21MS finally acknowledged CubaEike Rathke
2015-08-21Resolves: tdf#93468 add Arpitan (France,Italy) [frp-FR] [frp-IT]Eike Rathke
2015-08-11loplugin: defaultparamsNoel Grandin
2015-08-04idl,framework,forms: inline some use-once typedefsNoel Grandin
2015-08-03re-added accidentally removed LT_HAVE_INLINE defineNoel Grandin
2015-08-03remove some unused definesNoel Grandin
2015-07-10support en-GB-oxendict additionally to now deprecated en-GB-oedEike Rathke
2015-07-09tdf#90428 add Aranese [oc-ES] to language listEike Rathke
2015-07-03Fix typosAndrea Gelmini
2015-06-30add English (Gambia) [en-GM] to language list, tdf#92442Eike Rathke
2015-06-21Fix typosAndrea Gelmini
2015-06-03tdf#91199 add Venetian [vec-IT] to language listEike Rathke
2015-05-20teardown is only called from ~LiblangtagDataRef, anywayStephan Bergmann
2015-05-20typoStephan Bergmann