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

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

glib2: update to 2.48.0

File size: 7.1 KB
  • configure

    old new  
    2219822198 presetting ac_cv_c_bigendian=no (or yes) will help" "$LINENO" 5 ;;
    2219922199 esac
    2220022200
    22201 if test x$ac_cv_c_bigendian = xuniversal ; then
    22202   as_fn_error $? "Universal builds not supported: see https://bugs.gnome.org/742548" "$LINENO" 5
    22203 fi
    2220422201
    2220522202
    2220622203# check for header files
     
    3010230099*)                      glib_vacopy=''
    3010330100esac
    3010430101
    30105 if test x$glib_cv_va_val_copy = xno; then
    3010630102  glib_vacopy="\$glib_vacopy
    30107 #define G_VA_COPY_AS_ARRAY 1"
    30108 fi
     30103#ifdef __LP64__
     30104#define G_VA_COPY_AS_ARRAY 1
     30105#endif"
    3010930106
    3011030107g_have_gnuc_varargs=$g_have_gnuc_varargs
    3011130108g_have_iso_c_varargs=$g_have_iso_c_varargs
     
    3184931846        cat >>$outfile <<_______EOF
    3185031847#define G_HAVE_GINT64 1          /* deprecated, always true */
    3185131848
    31852 ${glib_extension}typedef signed $gint64 gint64;
    31853 ${glib_extension}typedef unsigned $gint64 guint64;
     31849#ifdef __LP64__
     31850${glib_extension}typedef signed long gint64;
     31851${glib_extension}typedef unsigned long guint64;
    3185431852
    31855 #define G_GINT64_CONSTANT(val)  $gint64_constant
    31856 #define G_GUINT64_CONSTANT(val) $guint64_constant
     31853#define G_GINT64_CONSTANT(val)  (val##L)
     31854#define G_GUINT64_CONSTANT(val) (val##UL)
     31855#else
     31856${glib_extension}typedef signed long long gint64;
     31857${glib_extension}typedef unsigned long long guint64;
     31858
     31859#define G_GINT64_CONSTANT(val)  (G_GNUC_EXTENSION (val##LL))
     31860#define G_GUINT64_CONSTANT(val) (G_GNUC_EXTENSION (val##ULL))
     31861#endif
    3185731862_______EOF
    3185831863
    3185931864        if test x$gint64_format != x ; then
    3186031865          cat >>$outfile <<_______EOF
    31861 #define G_GINT64_MODIFIER $gint64_modifier
    31862 #define G_GINT64_FORMAT $gint64_format
    31863 #define G_GUINT64_FORMAT $guint64_format
     31866#ifdef __LP64__
     31867#define G_GINT64_MODIFIER "l"
     31868#define G_GINT64_FORMAT "li"
     31869#define G_GUINT64_FORMAT "lu"
     31870#else
     31871#define G_GINT64_MODIFIER "ll"
     31872#define G_GINT64_FORMAT "lli"
     31873#define G_GUINT64_FORMAT "llu"
     31874#endif
    3186431875_______EOF
    3186531876        else
    3186631877          cat >>$outfile <<_______EOF
     
    3187231883
    3187331884        cat >>$outfile <<_______EOF
    3187431885
    31875 #define GLIB_SIZEOF_VOID_P $glib_void_p
    31876 #define GLIB_SIZEOF_LONG   $glib_long
    31877 #define GLIB_SIZEOF_SIZE_T $glib_size_t
    31878 #define GLIB_SIZEOF_SSIZE_T $glib_ssize_t
     31886#ifdef __LP64__
     31887#define GLIB_SIZEOF_VOID_P 8
     31888#define GLIB_SIZEOF_LONG   8
     31889#define GLIB_SIZEOF_SIZE_T 8
     31890#define GLIB_SIZEOF_SSIZE_T 8
     31891#else
     31892#define GLIB_SIZEOF_VOID_P 4
     31893#define GLIB_SIZEOF_LONG   4
     31894#define GLIB_SIZEOF_SIZE_T 4
     31895#define GLIB_SIZEOF_SSIZE_T 4
     31896#endif
    3187931897
    3188031898_______EOF
    3188131899
     
    3190631924        if test -z "$glib_unknown_void_p"; then
    3190731925          cat >>$outfile <<_______EOF
    3190831926
    31909 #define GPOINTER_TO_INT(p)      ((gint)  ${glib_gpi_cast} (p))
    31910 #define GPOINTER_TO_UINT(p)     ((guint) ${glib_gpui_cast} (p))
     31927#ifdef __LP64__
     31928#define GPOINTER_TO_INT(p)      ((gint)  (glong) (p))
     31929#define GPOINTER_TO_UINT(p)     ((guint) (gulong) (p))
     31930
     31931#define GINT_TO_POINTER(i)      ((gpointer) (glong) (i))
     31932#define GUINT_TO_POINTER(u)     ((gpointer) (gulong) (u))
     31933
     31934typedef signed long gintptr;
     31935typedef unsigned long guintptr;
     31936
     31937#define G_GINTPTR_MODIFIER      "l"
     31938#define G_GINTPTR_FORMAT        "li"
     31939#define G_GUINTPTR_FORMAT       "lu"
     31940#else
     31941#define GPOINTER_TO_INT(p)      ((gint)   (p))
     31942#define GPOINTER_TO_UINT(p)     ((guint)  (p))
    3191131943
    31912 #define GINT_TO_POINTER(i)      ((gpointer) ${glib_gpi_cast} (i))
    31913 #define GUINT_TO_POINTER(u)     ((gpointer) ${glib_gpui_cast} (u))
     31944#define GINT_TO_POINTER(i)      ((gpointer) (i))
     31945#define GUINT_TO_POINTER(u)     ((gpointer) (u))
    3191431946
    31915 typedef signed $glib_intptr_type_define gintptr;
    31916 typedef unsigned $glib_intptr_type_define guintptr;
     31947typedef signed int gintptr;
     31948typedef unsigned int guintptr;
    3191731949
    31918 #define G_GINTPTR_MODIFIER      $gintptr_modifier
    31919 #define G_GINTPTR_FORMAT        $gintptr_format
    31920 #define G_GUINTPTR_FORMAT       $guintptr_format
     31950#define G_GINTPTR_MODIFIER      ""
     31951#define G_GINTPTR_FORMAT        "i"
     31952#define G_GUINTPTR_FORMAT       "u"
     31953#endif
    3192131954_______EOF
    3192231955        else
    3192331956          echo '#error SIZEOF_VOID_P unknown - This should never happen' >>$outfile
     
    3201232045
    3201332046        if test x"$g_memory_barrier_needed" != xno; then
    3201432047          echo >>$outfile
     32048          echo "#ifdef __BIG_ENDIAN__" >>$outfile
    3201532049          echo "#define G_ATOMIC_OP_MEMORY_BARRIER_NEEDED 1" >>$outfile
     32050          echo "#endif" >>$outfile
    3201632051        fi
    3201732052        if test x"$g_atomic_lock_free" = xyes; then
    3201832053          echo >>$outfile
     
    3202232057        g_bit_sizes="16 32 64"
    3202332058        for bits in $g_bit_sizes; do
    3202432059          cat >>$outfile <<_______EOF
    32025 #define GINT${bits}_TO_${g_bs_native}(val)      ((gint${bits}) (val))
    32026 #define GUINT${bits}_TO_${g_bs_native}(val)     ((guint${bits}) (val))
    32027 #define GINT${bits}_TO_${g_bs_alien}(val)       ((gint${bits}) GUINT${bits}_SWAP_LE_BE (val))
    32028 #define GUINT${bits}_TO_${g_bs_alien}(val)      (GUINT${bits}_SWAP_LE_BE (val))
     32060#ifdef __BIG_ENDIAN__
     32061#define GINT${bits}_TO_BE(val)  ((gint${bits}) (val))
     32062#define GUINT${bits}_TO_BE(val) ((guint${bits}) (val))
     32063#define GINT${bits}_TO_LE(val)  ((gint${bits}) GUINT${bits}_SWAP_LE_BE (val))
     32064#define GUINT${bits}_TO_LE(val) (GUINT${bits}_SWAP_LE_BE (val))
     32065#else
     32066#define GINT${bits}_TO_LE(val)  ((gint${bits}) (val))
     32067#define GUINT${bits}_TO_LE(val) ((guint${bits}) (val))
     32068#define GINT${bits}_TO_BE(val)  ((gint${bits}) GUINT${bits}_SWAP_LE_BE (val))
     32069#define GUINT${bits}_TO_BE(val) (GUINT${bits}_SWAP_LE_BE (val))
     32070#endif
    3202932071_______EOF
    3203032072        done
    3203132073
    3203232074        cat >>$outfile <<_______EOF
    32033 #define GLONG_TO_LE(val)        ((glong) GINT${glongbits}_TO_LE (val))
    32034 #define GULONG_TO_LE(val)       ((gulong) GUINT${glongbits}_TO_LE (val))
    32035 #define GLONG_TO_BE(val)        ((glong) GINT${glongbits}_TO_BE (val))
    32036 #define GULONG_TO_BE(val)       ((gulong) GUINT${glongbits}_TO_BE (val))
     32075#ifdef __LP64__
     32076#define GLONG_TO_LE(val)        ((glong) GINT64_TO_LE (val))
     32077#define GULONG_TO_LE(val)       ((gulong) GUINT64_TO_LE (val))
     32078#define GLONG_TO_BE(val)        ((glong) GINT64_TO_BE (val))
     32079#define GULONG_TO_BE(val)       ((gulong) GUINT64_TO_BE (val))
     32080#else
     32081#define GLONG_TO_LE(val)        ((glong) GINT32_TO_LE (val))
     32082#define GULONG_TO_LE(val)       ((gulong) GUINT32_TO_LE (val))
     32083#define GLONG_TO_BE(val)        ((glong) GINT32_TO_BE (val))
     32084#define GULONG_TO_BE(val)       ((gulong) GUINT32_TO_BE (val))
     32085#endif
    3203732086#define GINT_TO_LE(val)         ((gint) GINT${gintbits}_TO_LE (val))
    3203832087#define GUINT_TO_LE(val)        ((guint) GUINT${gintbits}_TO_LE (val))
    3203932088#define GINT_TO_BE(val)         ((gint) GINT${gintbits}_TO_BE (val))
    3204032089#define GUINT_TO_BE(val)        ((guint) GUINT${gintbits}_TO_BE (val))
    32041 #define GSIZE_TO_LE(val)        ((gsize) GUINT${gsizebits}_TO_LE (val))
    32042 #define GSSIZE_TO_LE(val)       ((gssize) GINT${gssizebits}_TO_LE (val))
    32043 #define GSIZE_TO_BE(val)        ((gsize) GUINT${gsizebits}_TO_BE (val))
    32044 #define GSSIZE_TO_BE(val)       ((gssize) GINT${gssizebits}_TO_BE (val))
    32045 #define G_BYTE_ORDER $g_byte_order
     32090#ifdef __LP64__
     32091#define GSIZE_TO_LE(val)        ((gsize) GUINT64_TO_LE (val))
     32092#define GSSIZE_TO_LE(val)       ((gssize) GINT64_TO_LE (val))
     32093#define GSIZE_TO_BE(val)        ((gsize) GUINT64_TO_BE (val))
     32094#define GSSIZE_TO_BE(val)       ((gssize) GINT64_TO_BE (val))
     32095#else
     32096#define GSIZE_TO_LE(val)        ((gsize) GUINT32_TO_LE (val))
     32097#define GSSIZE_TO_LE(val)       ((gssize) GINT32_TO_LE (val))
     32098#define GSIZE_TO_BE(val)        ((gsize) GUINT32_TO_BE (val))
     32099#define GSSIZE_TO_BE(val)       ((gssize) GINT32_TO_BE (val))
     32100#endif
     32101#ifdef __BIG_ENDIAN__
     32102#define G_BYTE_ORDER G_BIG_ENDIAN
     32103#else
     32104#define G_BYTE_ORDER G_LITTLE_ENDIAN
     32105#endif
    3204632106
    3204732107#define GLIB_SYSDEF_POLLIN =$g_pollin
    3204832108#define GLIB_SYSDEF_POLLOUT =$g_pollout
Note: See TracBrowser for help on using the repository browser.