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

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

glib2-devel: update to 2.31.18

File size: 6.7 KB
  • configure

    old new  
    3004630046*)                      glib_vacopy=''
    3004730047esac
    3004830048
    30049 if test x$glib_cv_va_val_copy = xno; then
    3005030049  glib_vacopy="\$glib_vacopy
    30051 #define G_VA_COPY_AS_ARRAY 1"
    30052 fi
     30050#ifdef __LP64__
     30051#define G_VA_COPY_AS_ARRAY 1
     30052#endif"
    3005330053
    3005430054if test x$glib_cv_hasinline = xyes; then
    3005530055    glib_inline='#define G_HAVE_INLINE 1'
     
    3180031800        cat >>$outfile <<_______EOF
    3180131801#define G_HAVE_GINT64 1          /* deprecated, always true */
    3180231802
    31803 ${glib_extension}typedef signed $gint64 gint64;
    31804 ${glib_extension}typedef unsigned $gint64 guint64;
     31803#ifdef __LP64__
     31804${glib_extension}typedef signed long gint64;
     31805${glib_extension}typedef unsigned long guint64;
     31806
     31807#define G_GINT64_CONSTANT(val)  (val##L)
     31808#define G_GUINT64_CONSTANT(val) (val##UL)
     31809#else
     31810${glib_extension}typedef signed long long gint64;
     31811${glib_extension}typedef unsigned long long guint64;
    3180531812
    31806 #define G_GINT64_CONSTANT(val)  $gint64_constant
    31807 #define G_GUINT64_CONSTANT(val) $guint64_constant
     31813#define G_GINT64_CONSTANT(val)  (G_GNUC_EXTENSION (val##LL))
     31814#define G_GUINT64_CONSTANT(val) (G_GNUC_EXTENSION (val##ULL))
     31815#endif
    3180831816_______EOF
    3180931817
    3181031818        if test x$gint64_format != x ; then
    3181131819          cat >>$outfile <<_______EOF
    31812 #define G_GINT64_MODIFIER $gint64_modifier
    31813 #define G_GINT64_FORMAT $gint64_format
    31814 #define G_GUINT64_FORMAT $guint64_format
     31820#ifdef __LP64__
     31821#define G_GINT64_MODIFIER "l"
     31822#define G_GINT64_FORMAT "li"
     31823#define G_GUINT64_FORMAT "lu"
     31824#else
     31825#define G_GINT64_MODIFIER "ll"
     31826#define G_GINT64_FORMAT "lli"
     31827#define G_GUINT64_FORMAT "llu"
     31828#endif
    3181531829_______EOF
    3181631830        else
    3181731831          cat >>$outfile <<_______EOF
     
    3182331837
    3182431838        cat >>$outfile <<_______EOF
    3182531839
    31826 #define GLIB_SIZEOF_VOID_P $glib_void_p
    31827 #define GLIB_SIZEOF_LONG   $glib_long
    31828 #define GLIB_SIZEOF_SIZE_T $glib_size_t
     31840#ifdef __LP64__
     31841#define GLIB_SIZEOF_VOID_P 8
     31842#define GLIB_SIZEOF_LONG   8
     31843#define GLIB_SIZEOF_SIZE_T 8
     31844#else
     31845#define GLIB_SIZEOF_VOID_P 4
     31846#define GLIB_SIZEOF_LONG   4
     31847#define GLIB_SIZEOF_SIZE_T 4
     31848#endif
    3182931849
    3183031850_______EOF
    3183131851
     
    3185331873        if test -z "$glib_unknown_void_p"; then
    3185431874          cat >>$outfile <<_______EOF
    3185531875
    31856 #define GPOINTER_TO_INT(p)      ((gint)  ${glib_gpi_cast} (p))
    31857 #define GPOINTER_TO_UINT(p)     ((guint) ${glib_gpui_cast} (p))
     31876#ifdef __LP64__
     31877#define GPOINTER_TO_INT(p)      ((gint)  (glong) (p))
     31878#define GPOINTER_TO_UINT(p)     ((guint) (gulong) (p))
     31879
     31880#define GINT_TO_POINTER(i)      ((gpointer) (glong) (i))
     31881#define GUINT_TO_POINTER(u)     ((gpointer) (gulong) (u))
     31882
     31883typedef signed long gintptr;
     31884typedef unsigned long guintptr;
     31885
     31886#define G_GINTPTR_MODIFIER      "l"
     31887#define G_GINTPTR_FORMAT        "li"
     31888#define G_GUINTPTR_FORMAT       "lu"
     31889#else
     31890#define GPOINTER_TO_INT(p)      ((gint)   (p))
     31891#define GPOINTER_TO_UINT(p)     ((guint)  (p))
    3185831892
    31859 #define GINT_TO_POINTER(i)      ((gpointer) ${glib_gpi_cast} (i))
    31860 #define GUINT_TO_POINTER(u)     ((gpointer) ${glib_gpui_cast} (u))
     31893#define GINT_TO_POINTER(i)      ((gpointer) (i))
     31894#define GUINT_TO_POINTER(u)     ((gpointer) (u))
    3186131895
    31862 typedef signed $glib_intptr_type_define gintptr;
    31863 typedef unsigned $glib_intptr_type_define guintptr;
     31896typedef signed int gintptr;
     31897typedef unsigned int guintptr;
    3186431898
    31865 #define G_GINTPTR_MODIFIER      $gintptr_modifier
    31866 #define G_GINTPTR_FORMAT        $gintptr_format
    31867 #define G_GUINTPTR_FORMAT       $guintptr_format
     31899#define G_GINTPTR_MODIFIER      ""
     31900#define G_GINTPTR_FORMAT        "i"
     31901#define G_GUINTPTR_FORMAT       "u"
     31902#endif
    3186831903_______EOF
    3186931904        else
    3187031905          echo '#error SIZEOF_VOID_P unknown - This should never happen' >>$outfile
     
    3197732012
    3197832013        if test x"$g_memory_barrier_needed" != xno; then
    3197932014          echo >>$outfile
     32015          echo "#ifdef __BIG_ENDIAN__" >>$outfile
    3198032016          echo "#define G_ATOMIC_OP_MEMORY_BARRIER_NEEDED 1" >>$outfile
     32017          echo "#endif" >>$outfile
    3198132018        fi
    3198232019        if test x"$g_atomic_lock_free" = xyes; then
    3198332020          echo >>$outfile
     
    3198732024        g_bit_sizes="16 32 64"
    3198832025        for bits in $g_bit_sizes; do
    3198932026          cat >>$outfile <<_______EOF
    31990 #define GINT${bits}_TO_${g_bs_native}(val)      ((gint${bits}) (val))
    31991 #define GUINT${bits}_TO_${g_bs_native}(val)     ((guint${bits}) (val))
    31992 #define GINT${bits}_TO_${g_bs_alien}(val)       ((gint${bits}) GUINT${bits}_SWAP_LE_BE (val))
    31993 #define GUINT${bits}_TO_${g_bs_alien}(val)      (GUINT${bits}_SWAP_LE_BE (val))
     32027#ifdef __BIG_ENDIAN__
     32028#define GINT${bits}_TO_BE(val)  ((gint${bits}) (val))
     32029#define GUINT${bits}_TO_BE(val) ((guint${bits}) (val))
     32030#define GINT${bits}_TO_LE(val)  ((gint${bits}) GUINT${bits}_SWAP_LE_BE (val))
     32031#define GUINT${bits}_TO_LE(val) (GUINT${bits}_SWAP_LE_BE (val))
     32032#else
     32033#define GINT${bits}_TO_LE(val)  ((gint${bits}) (val))
     32034#define GUINT${bits}_TO_LE(val) ((guint${bits}) (val))
     32035#define GINT${bits}_TO_BE(val)  ((gint${bits}) GUINT${bits}_SWAP_LE_BE (val))
     32036#define GUINT${bits}_TO_BE(val) (GUINT${bits}_SWAP_LE_BE (val))
     32037#endif
    3199432038_______EOF
    3199532039        done
    3199632040
    3199732041        cat >>$outfile <<_______EOF
    31998 #define GLONG_TO_LE(val)        ((glong) GINT${glongbits}_TO_LE (val))
    31999 #define GULONG_TO_LE(val)       ((gulong) GUINT${glongbits}_TO_LE (val))
    32000 #define GLONG_TO_BE(val)        ((glong) GINT${glongbits}_TO_BE (val))
    32001 #define GULONG_TO_BE(val)       ((gulong) GUINT${glongbits}_TO_BE (val))
     32042#ifdef __LP64__
     32043#define GLONG_TO_LE(val)        ((glong) GINT64_TO_LE (val))
     32044#define GULONG_TO_LE(val)       ((gulong) GUINT64_TO_LE (val))
     32045#define GLONG_TO_BE(val)        ((glong) GINT64_TO_BE (val))
     32046#define GULONG_TO_BE(val)       ((gulong) GUINT64_TO_BE (val))
     32047#else
     32048#define GLONG_TO_LE(val)        ((glong) GINT32_TO_LE (val))
     32049#define GULONG_TO_LE(val)       ((gulong) GUINT32_TO_LE (val))
     32050#define GLONG_TO_BE(val)        ((glong) GINT32_TO_BE (val))
     32051#define GULONG_TO_BE(val)       ((gulong) GUINT32_TO_BE (val))
     32052#endif
    3200232053#define GINT_TO_LE(val)         ((gint) GINT${gintbits}_TO_LE (val))
    3200332054#define GUINT_TO_LE(val)        ((guint) GUINT${gintbits}_TO_LE (val))
    3200432055#define GINT_TO_BE(val)         ((gint) GINT${gintbits}_TO_BE (val))
    3200532056#define GUINT_TO_BE(val)        ((guint) GUINT${gintbits}_TO_BE (val))
    32006 #define GSIZE_TO_LE(val)        ((gsize) GUINT${gsizebits}_TO_LE (val))
    32007 #define GSSIZE_TO_LE(val)       ((gssize) GINT${gsizebits}_TO_LE (val))
    32008 #define GSIZE_TO_BE(val)        ((gsize) GUINT${gsizebits}_TO_BE (val))
    32009 #define GSSIZE_TO_BE(val)       ((gssize) GINT${gsizebits}_TO_BE (val))
    32010 #define G_BYTE_ORDER $g_byte_order
     32057#ifdef __LP64__
     32058#define GSIZE_TO_LE(val)        ((gsize) GUINT64_TO_LE (val))
     32059#define GSSIZE_TO_LE(val)       ((gssize) GINT64_TO_LE (val))
     32060#define GSIZE_TO_BE(val)        ((gsize) GUINT64_TO_BE (val))
     32061#define GSSIZE_TO_BE(val)       ((gssize) GINT64_TO_BE (val))
     32062#else
     32063#define GSIZE_TO_LE(val)        ((gsize) GUINT32_TO_LE (val))
     32064#define GSSIZE_TO_LE(val)       ((gssize) GINT32_TO_LE (val))
     32065#define GSIZE_TO_BE(val)        ((gsize) GUINT32_TO_BE (val))
     32066#define GSSIZE_TO_BE(val)       ((gssize) GINT32_TO_BE (val))
     32067#endif
     32068#ifdef __BIG_ENDIAN__
     32069#define G_BYTE_ORDER G_BIG_ENDIAN
     32070#else
     32071#define G_BYTE_ORDER G_LITTLE_ENDIAN
     32072#endif
    3201132073
    3201232074#define GLIB_SYSDEF_POLLIN =$g_pollin
    3201332075#define GLIB_SYSDEF_POLLOUT =$g_pollout
Note: See TracBrowser for help on using the repository browser.