source: trunk/dports/devel/glib2/files/patch-configure.diff @ 134559

Last change on this file since 134559 was 134559, checked in by ryandesign@…, 4 years ago

glib2: update to 2.44.0

File size: 7.3 KB
  • configure

    old new  
    60866086fi
    60876087
    60886088GLIB_RUNTIME_LIBDIR="$with_runtime_libdir"
    6089 ABS_GLIB_RUNTIME_LIBDIR="`readlink -f $libdir/$with_runtime_libdir`"
     6089ABS_GLIB_RUNTIME_LIBDIR="`readlink $libdir/$with_runtime_libdir`"
    60906090
    60916091
    60926092 if test "x$with_runtime_libdir" != "x"; then
     
    2224022240 presetting ac_cv_c_bigendian=no (or yes) will help" "$LINENO" 5 ;;
    2224122241 esac
    2224222242
    22243 if test x$ac_cv_c_bigendian = xuniversal ; then
    22244   as_fn_error $? "Universal builds not supported: see https://bugs.gnome.org/742548" "$LINENO" 5
    22245 fi
    2224622243
    2224722244
    2224822245# check for header files
     
    3046430461*)                      glib_vacopy=''
    3046530462esac
    3046630463
    30467 if test x$glib_cv_va_val_copy = xno; then
    3046830464  glib_vacopy="\$glib_vacopy
    30469 #define G_VA_COPY_AS_ARRAY 1"
    30470 fi
     30465#ifdef __LP64__
     30466#define G_VA_COPY_AS_ARRAY 1
     30467#endif"
    3047130468
    3047230469if test x$glib_cv_hasinline = xyes; then
    3047330470    glib_inline='#define G_HAVE_INLINE 1'
     
    3222432221        cat >>$outfile <<_______EOF
    3222532222#define G_HAVE_GINT64 1          /* deprecated, always true */
    3222632223
    32227 ${glib_extension}typedef signed $gint64 gint64;
    32228 ${glib_extension}typedef unsigned $gint64 guint64;
     32224#ifdef __LP64__
     32225${glib_extension}typedef signed long gint64;
     32226${glib_extension}typedef unsigned long guint64;
    3222932227
    32230 #define G_GINT64_CONSTANT(val)  $gint64_constant
    32231 #define G_GUINT64_CONSTANT(val) $guint64_constant
     32228#define G_GINT64_CONSTANT(val)  (val##L)
     32229#define G_GUINT64_CONSTANT(val) (val##UL)
     32230#else
     32231${glib_extension}typedef signed long long gint64;
     32232${glib_extension}typedef unsigned long long guint64;
     32233
     32234#define G_GINT64_CONSTANT(val)  (G_GNUC_EXTENSION (val##LL))
     32235#define G_GUINT64_CONSTANT(val) (G_GNUC_EXTENSION (val##ULL))
     32236#endif
    3223232237_______EOF
    3223332238
    3223432239        if test x$gint64_format != x ; then
    3223532240          cat >>$outfile <<_______EOF
    32236 #define G_GINT64_MODIFIER $gint64_modifier
    32237 #define G_GINT64_FORMAT $gint64_format
    32238 #define G_GUINT64_FORMAT $guint64_format
     32241#ifdef __LP64__
     32242#define G_GINT64_MODIFIER "l"
     32243#define G_GINT64_FORMAT "li"
     32244#define G_GUINT64_FORMAT "lu"
     32245#else
     32246#define G_GINT64_MODIFIER "ll"
     32247#define G_GINT64_FORMAT "lli"
     32248#define G_GUINT64_FORMAT "llu"
     32249#endif
    3223932250_______EOF
    3224032251        else
    3224132252          cat >>$outfile <<_______EOF
     
    3224732258
    3224832259        cat >>$outfile <<_______EOF
    3224932260
    32250 #define GLIB_SIZEOF_VOID_P $glib_void_p
    32251 #define GLIB_SIZEOF_LONG   $glib_long
    32252 #define GLIB_SIZEOF_SIZE_T $glib_size_t
    32253 #define GLIB_SIZEOF_SSIZE_T $glib_ssize_t
     32261#ifdef __LP64__
     32262#define GLIB_SIZEOF_VOID_P 8
     32263#define GLIB_SIZEOF_LONG   8
     32264#define GLIB_SIZEOF_SIZE_T 8
     32265#define GLIB_SIZEOF_SSIZE_T 8
     32266#else
     32267#define GLIB_SIZEOF_VOID_P 4
     32268#define GLIB_SIZEOF_LONG   4
     32269#define GLIB_SIZEOF_SIZE_T 4
     32270#define GLIB_SIZEOF_SSIZE_T 4
     32271#endif
    3225432272
    3225532273_______EOF
    3225632274
     
    3227932297        if test -z "$glib_unknown_void_p"; then
    3228032298          cat >>$outfile <<_______EOF
    3228132299
    32282 #define GPOINTER_TO_INT(p)      ((gint)  ${glib_gpi_cast} (p))
    32283 #define GPOINTER_TO_UINT(p)     ((guint) ${glib_gpui_cast} (p))
     32300#ifdef __LP64__
     32301#define GPOINTER_TO_INT(p)      ((gint)  (glong) (p))
     32302#define GPOINTER_TO_UINT(p)     ((guint) (gulong) (p))
     32303
     32304#define GINT_TO_POINTER(i)      ((gpointer) (glong) (i))
     32305#define GUINT_TO_POINTER(u)     ((gpointer) (gulong) (u))
     32306
     32307typedef signed long gintptr;
     32308typedef unsigned long guintptr;
     32309
     32310#define G_GINTPTR_MODIFIER      "l"
     32311#define G_GINTPTR_FORMAT        "li"
     32312#define G_GUINTPTR_FORMAT       "lu"
     32313#else
     32314#define GPOINTER_TO_INT(p)      ((gint)   (p))
     32315#define GPOINTER_TO_UINT(p)     ((guint)  (p))
    3228432316
    32285 #define GINT_TO_POINTER(i)      ((gpointer) ${glib_gpi_cast} (i))
    32286 #define GUINT_TO_POINTER(u)     ((gpointer) ${glib_gpui_cast} (u))
     32317#define GINT_TO_POINTER(i)      ((gpointer) (i))
     32318#define GUINT_TO_POINTER(u)     ((gpointer) (u))
    3228732319
    32288 typedef signed $glib_intptr_type_define gintptr;
    32289 typedef unsigned $glib_intptr_type_define guintptr;
     32320typedef signed int gintptr;
     32321typedef unsigned int guintptr;
    3229032322
    32291 #define G_GINTPTR_MODIFIER      $gintptr_modifier
    32292 #define G_GINTPTR_FORMAT        $gintptr_format
    32293 #define G_GUINTPTR_FORMAT       $guintptr_format
     32323#define G_GINTPTR_MODIFIER      ""
     32324#define G_GINTPTR_FORMAT        "i"
     32325#define G_GUINTPTR_FORMAT       "u"
     32326#endif
    3229432327_______EOF
    3229532328        else
    3229632329          echo '#error SIZEOF_VOID_P unknown - This should never happen' >>$outfile
     
    3240532438
    3240632439        if test x"$g_memory_barrier_needed" != xno; then
    3240732440          echo >>$outfile
     32441          echo "#ifdef __BIG_ENDIAN__" >>$outfile
    3240832442          echo "#define G_ATOMIC_OP_MEMORY_BARRIER_NEEDED 1" >>$outfile
     32443          echo "#endif" >>$outfile
    3240932444        fi
    3241032445        if test x"$g_atomic_lock_free" = xyes; then
    3241132446          echo >>$outfile
     
    3241532450        g_bit_sizes="16 32 64"
    3241632451        for bits in $g_bit_sizes; do
    3241732452          cat >>$outfile <<_______EOF
    32418 #define GINT${bits}_TO_${g_bs_native}(val)      ((gint${bits}) (val))
    32419 #define GUINT${bits}_TO_${g_bs_native}(val)     ((guint${bits}) (val))
    32420 #define GINT${bits}_TO_${g_bs_alien}(val)       ((gint${bits}) GUINT${bits}_SWAP_LE_BE (val))
    32421 #define GUINT${bits}_TO_${g_bs_alien}(val)      (GUINT${bits}_SWAP_LE_BE (val))
     32453#ifdef __BIG_ENDIAN__
     32454#define GINT${bits}_TO_BE(val)  ((gint${bits}) (val))
     32455#define GUINT${bits}_TO_BE(val) ((guint${bits}) (val))
     32456#define GINT${bits}_TO_LE(val)  ((gint${bits}) GUINT${bits}_SWAP_LE_BE (val))
     32457#define GUINT${bits}_TO_LE(val) (GUINT${bits}_SWAP_LE_BE (val))
     32458#else
     32459#define GINT${bits}_TO_LE(val)  ((gint${bits}) (val))
     32460#define GUINT${bits}_TO_LE(val) ((guint${bits}) (val))
     32461#define GINT${bits}_TO_BE(val)  ((gint${bits}) GUINT${bits}_SWAP_LE_BE (val))
     32462#define GUINT${bits}_TO_BE(val) (GUINT${bits}_SWAP_LE_BE (val))
     32463#endif
    3242232464_______EOF
    3242332465        done
    3242432466
    3242532467        cat >>$outfile <<_______EOF
    32426 #define GLONG_TO_LE(val)        ((glong) GINT${glongbits}_TO_LE (val))
    32427 #define GULONG_TO_LE(val)       ((gulong) GUINT${glongbits}_TO_LE (val))
    32428 #define GLONG_TO_BE(val)        ((glong) GINT${glongbits}_TO_BE (val))
    32429 #define GULONG_TO_BE(val)       ((gulong) GUINT${glongbits}_TO_BE (val))
     32468#ifdef __LP64__
     32469#define GLONG_TO_LE(val)        ((glong) GINT64_TO_LE (val))
     32470#define GULONG_TO_LE(val)       ((gulong) GUINT64_TO_LE (val))
     32471#define GLONG_TO_BE(val)        ((glong) GINT64_TO_BE (val))
     32472#define GULONG_TO_BE(val)       ((gulong) GUINT64_TO_BE (val))
     32473#else
     32474#define GLONG_TO_LE(val)        ((glong) GINT32_TO_LE (val))
     32475#define GULONG_TO_LE(val)       ((gulong) GUINT32_TO_LE (val))
     32476#define GLONG_TO_BE(val)        ((glong) GINT32_TO_BE (val))
     32477#define GULONG_TO_BE(val)       ((gulong) GUINT32_TO_BE (val))
     32478#endif
    3243032479#define GINT_TO_LE(val)         ((gint) GINT${gintbits}_TO_LE (val))
    3243132480#define GUINT_TO_LE(val)        ((guint) GUINT${gintbits}_TO_LE (val))
    3243232481#define GINT_TO_BE(val)         ((gint) GINT${gintbits}_TO_BE (val))
    3243332482#define GUINT_TO_BE(val)        ((guint) GUINT${gintbits}_TO_BE (val))
    32434 #define GSIZE_TO_LE(val)        ((gsize) GUINT${gsizebits}_TO_LE (val))
    32435 #define GSSIZE_TO_LE(val)       ((gssize) GINT${gssizebits}_TO_LE (val))
    32436 #define GSIZE_TO_BE(val)        ((gsize) GUINT${gsizebits}_TO_BE (val))
    32437 #define GSSIZE_TO_BE(val)       ((gssize) GINT${gssizebits}_TO_BE (val))
    32438 #define G_BYTE_ORDER $g_byte_order
     32483#ifdef __LP64__
     32484#define GSIZE_TO_LE(val)        ((gsize) GUINT64_TO_LE (val))
     32485#define GSSIZE_TO_LE(val)       ((gssize) GINT64_TO_LE (val))
     32486#define GSIZE_TO_BE(val)        ((gsize) GUINT64_TO_BE (val))
     32487#define GSSIZE_TO_BE(val)       ((gssize) GINT64_TO_BE (val))
     32488#else
     32489#define GSIZE_TO_LE(val)        ((gsize) GUINT32_TO_LE (val))
     32490#define GSSIZE_TO_LE(val)       ((gssize) GINT32_TO_LE (val))
     32491#define GSIZE_TO_BE(val)        ((gsize) GUINT32_TO_BE (val))
     32492#define GSSIZE_TO_BE(val)       ((gssize) GINT32_TO_BE (val))
     32493#endif
     32494#ifdef __BIG_ENDIAN__
     32495#define G_BYTE_ORDER G_BIG_ENDIAN
     32496#else
     32497#define G_BYTE_ORDER G_LITTLE_ENDIAN
     32498#endif
    3243932499
    3244032500#define GLIB_SYSDEF_POLLIN =$g_pollin
    3244132501#define GLIB_SYSDEF_POLLOUT =$g_pollout
Note: See TracBrowser for help on using the repository browser.