Changeset 25962


Ignore:
Timestamp:
2011-03-08T20:07:17+01:00 (7 years ago)
Author:
jow
Message:

[packages] glib: remove some unneeded deltas in the previous patch commit

File:
1 edited

Legend:

Unmodified
Added
Removed
  • packages/libs/glib/patches/001-automake-compat.patch

    r25961 r25962  
    9494 AC_HEADER_STDC 
    9595  
    96 @@ -218,13 +179,6 @@ AC_FUNC_VPRINTF 
    97   
    98  AC_CHECK_FUNCS(atexit on_exit) 
    99   
    100 -AC_CHECK_SIZEOF(char) 
    101 -AC_CHECK_SIZEOF(short) 
    102 -AC_CHECK_SIZEOF(long) 
    103 -AC_CHECK_SIZEOF(int) 
    104 -AC_CHECK_SIZEOF(void *) 
    105 -AC_CHECK_SIZEOF(long long) 
    106 - 
    107  dnl long doubles were not used, and a portability problem 
    108  dnl AC_C_LONG_DOUBLE 
    109  AC_C_CONST 
    110 @@ -405,11 +359,13 @@ AC_CACHE_VAL(glib_cv_sane_realloc,[ 
     96@@ -405,11 +366,13 @@ AC_CACHE_VAL(glib_cv_sane_realloc,[ 
    11197          return realloc (0, sizeof (int)) == 0; 
    11298        }], 
     
    123109  
    124110  
    125 @@ -485,7 +441,8 @@ AC_CACHE_VAL(glib_cv_va_val_copy,[ 
     111@@ -485,7 +448,8 @@ AC_CACHE_VAL(glib_cv_va_val_copy,[ 
    126112 ]) 
    127113 if test "x$glib_cv_va_copy" = "xyes"; then 
     
    133119 fi 
    134120 fi 
    135 @@ -505,21 +462,13 @@ G_MODULE_NEED_USCORE=0 
     121@@ -505,21 +469,13 @@ G_MODULE_NEED_USCORE=0 
    136122 G_MODULE_BROKEN_RTLD_GLOBAL=0 
    137123 G_MODULE_HAVE_DLERROR=0 
     
    160146 dnl *** shl_load() in libdld (HP-UX) 
    161147 if test -z "$G_MODULE_IMPL"; then 
    162 @@ -784,13 +733,13 @@ AC_MSG_RESULT($G_THREAD_LIBS) 
    163  dnl determination of G_THREAD_CFLAGS 
    164  dnl ******************************** 
    165   
    166 -if test x"$have_threads" != xnone; then 
    167 +if test "x$have_threads" != xnone; then 
    168  G_THREAD_CFLAGS="$G_THREAD_CFLAGS -D_REENTRANT" # good default guess 
    169   
    170      case $host in 
    171         *-aix*) 
    172                 G_THREAD_CFLAGS="$G_THREAD_CFLAGS -D_THREAD_SAFE" 
    173 -               if test x"$GCC" = xyes; then 
    174 +               if test "x$GCC" = xyes; then 
    175                         G_THREAD_CFLAGS="$G_THREAD_CFLAGS -mthreads" 
    176                 fi 
    177                 ;; 
    178 @@ -822,7 +771,7 @@ fi 
    179  dnl check for mt safe function variants 
    180  dnl *********************************** 
    181   
    182 -if test x"$have_threads" != xnone; then 
    183 +if test "x$have_threads" != xnone; then 
    184         glib_save_LIBS="$LIBS" 
    185         glib_save_CFLAGS="$CFLAGS" 
    186         # we are not doing the following for now, as this might require glib  
    187 @@ -854,49 +803,68 @@ if test x"$have_threads" != xnone; then 
     148@@ -854,49 +810,68 @@ if test x"$have_threads" != xnone; then 
    188149                        AC_MSG_CHECKING(whether getpwuid_r is posix like) 
    189150                        # The signature for the POSIX version is: 
     
    210171                fi 
    211172        fi 
    212 -       if test x"$have_threads" = xposix; then 
    213 +       if test "x$have_threads" = xposix; then 
     173        if test x"$have_threads" = xposix; then 
    214174                LIBS="$LIBS $G_THREAD_LIBS" 
    215175                AC_MSG_CHECKING(whether pthread_getspecific is posix like) 
     
    288248        LIBS="$glib_save_LIBS" 
    289249        CFLAGS="$glib_save_CFLAGS" 
    290 @@ -940,13 +908,21 @@ GLIB_IF_VAR_EQ(mutex_has_default, yes, 
     250@@ -940,12 +915,14 @@ GLIB_IF_VAR_EQ(mutex_has_default, yes, 
    291251 dnl **************************************** 
    292252 dnl *** GLib POLL* compatibility defines *** 
     
    301261+fi 
    302262  
    303 +dnl Needed for the gint* case switches further down ... 
    304 +AC_CHECK_SIZEOF([short]) 
    305 +AC_CHECK_SIZEOF([int]) 
    306 +AC_CHECK_SIZEOF([long]) 
    307 +AC_CHECK_SIZEOF([long long]) 
    308 +AC_CHECK_SIZEOF([void *]) 
    309263  
    310264 dnl ****************************** 
    311  dnl *** output the whole stuff *** 
    312265--- a/Makefile.am 
    313266+++ b/Makefile.am 
Note: See TracChangeset for help on using the changeset viewer.