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

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

glib2-devel: update to 2.31.16

File size: 6.7 KB
  • configure

    old new  
    2999129991*)                      glib_vacopy=''
    2999229992esac
    2999329993
    29994 if test x$glib_cv_va_val_copy = xno; then
    2999529994  glib_vacopy="\$glib_vacopy
    29996 #define G_VA_COPY_AS_ARRAY 1"
    29997 fi
     29995#ifdef __LP64__
     29996#define G_VA_COPY_AS_ARRAY 1
     29997#endif"
    2999829998
    2999929999if test x$glib_cv_hasinline = xyes; then
    3000030000    glib_inline='#define G_HAVE_INLINE 1'
     
    3174531745        cat >>$outfile <<_______EOF
    3174631746#define G_HAVE_GINT64 1          /* deprecated, always true */
    3174731747
    31748 ${glib_extension}typedef signed $gint64 gint64;
    31749 ${glib_extension}typedef unsigned $gint64 guint64;
     31748#ifdef __LP64__
     31749${glib_extension}typedef signed long gint64;
     31750${glib_extension}typedef unsigned long guint64;
     31751
     31752#define G_GINT64_CONSTANT(val)  (val##L)
     31753#define G_GUINT64_CONSTANT(val) (val##UL)
     31754#else
     31755${glib_extension}typedef signed long long gint64;
     31756${glib_extension}typedef unsigned long long guint64;
    3175031757
    31751 #define G_GINT64_CONSTANT(val)  $gint64_constant
    31752 #define G_GUINT64_CONSTANT(val) $guint64_constant
     31758#define G_GINT64_CONSTANT(val)  (G_GNUC_EXTENSION (val##LL))
     31759#define G_GUINT64_CONSTANT(val) (G_GNUC_EXTENSION (val##ULL))
     31760#endif
    3175331761_______EOF
    3175431762
    3175531763        if test x$gint64_format != x ; then
    3175631764          cat >>$outfile <<_______EOF
    31757 #define G_GINT64_MODIFIER $gint64_modifier
    31758 #define G_GINT64_FORMAT $gint64_format
    31759 #define G_GUINT64_FORMAT $guint64_format
     31765#ifdef __LP64__
     31766#define G_GINT64_MODIFIER "l"
     31767#define G_GINT64_FORMAT "li"
     31768#define G_GUINT64_FORMAT "lu"
     31769#else
     31770#define G_GINT64_MODIFIER "ll"
     31771#define G_GINT64_FORMAT "lli"
     31772#define G_GUINT64_FORMAT "llu"
     31773#endif
    3176031774_______EOF
    3176131775        else
    3176231776          cat >>$outfile <<_______EOF
     
    3176831782
    3176931783        cat >>$outfile <<_______EOF
    3177031784
    31771 #define GLIB_SIZEOF_VOID_P $glib_void_p
    31772 #define GLIB_SIZEOF_LONG   $glib_long
    31773 #define GLIB_SIZEOF_SIZE_T $glib_size_t
     31785#ifdef __LP64__
     31786#define GLIB_SIZEOF_VOID_P 8
     31787#define GLIB_SIZEOF_LONG   8
     31788#define GLIB_SIZEOF_SIZE_T 8
     31789#else
     31790#define GLIB_SIZEOF_VOID_P 4
     31791#define GLIB_SIZEOF_LONG   4
     31792#define GLIB_SIZEOF_SIZE_T 4
     31793#endif
    3177431794
    3177531795_______EOF
    3177631796
     
    3179831818        if test -z "$glib_unknown_void_p"; then
    3179931819          cat >>$outfile <<_______EOF
    3180031820
    31801 #define GPOINTER_TO_INT(p)      ((gint)  ${glib_gpi_cast} (p))
    31802 #define GPOINTER_TO_UINT(p)     ((guint) ${glib_gpui_cast} (p))
     31821#ifdef __LP64__
     31822#define GPOINTER_TO_INT(p)      ((gint)  (glong) (p))
     31823#define GPOINTER_TO_UINT(p)     ((guint) (gulong) (p))
     31824
     31825#define GINT_TO_POINTER(i)      ((gpointer) (glong) (i))
     31826#define GUINT_TO_POINTER(u)     ((gpointer) (gulong) (u))
     31827
     31828typedef signed long gintptr;
     31829typedef unsigned long guintptr;
     31830
     31831#define G_GINTPTR_MODIFIER      "l"
     31832#define G_GINTPTR_FORMAT        "li"
     31833#define G_GUINTPTR_FORMAT       "lu"
     31834#else
     31835#define GPOINTER_TO_INT(p)      ((gint)   (p))
     31836#define GPOINTER_TO_UINT(p)     ((guint)  (p))
    3180331837
    31804 #define GINT_TO_POINTER(i)      ((gpointer) ${glib_gpi_cast} (i))
    31805 #define GUINT_TO_POINTER(u)     ((gpointer) ${glib_gpui_cast} (u))
     31838#define GINT_TO_POINTER(i)      ((gpointer) (i))
     31839#define GUINT_TO_POINTER(u)     ((gpointer) (u))
    3180631840
    31807 typedef signed $glib_intptr_type_define gintptr;
    31808 typedef unsigned $glib_intptr_type_define guintptr;
     31841typedef signed int gintptr;
     31842typedef unsigned int guintptr;
    3180931843
    31810 #define G_GINTPTR_MODIFIER      $gintptr_modifier
    31811 #define G_GINTPTR_FORMAT        $gintptr_format
    31812 #define G_GUINTPTR_FORMAT       $guintptr_format
     31844#define G_GINTPTR_MODIFIER      ""
     31845#define G_GINTPTR_FORMAT        "i"
     31846#define G_GUINTPTR_FORMAT       "u"
     31847#endif
    3181331848_______EOF
    3181431849        else
    3181531850          echo '#error SIZEOF_VOID_P unknown - This should never happen' >>$outfile
     
    3192231957
    3192331958        if test x"$g_memory_barrier_needed" != xno; then
    3192431959          echo >>$outfile
     31960          echo "#ifdef __BIG_ENDIAN__" >>$outfile
    3192531961          echo "#define G_ATOMIC_OP_MEMORY_BARRIER_NEEDED 1" >>$outfile
     31962          echo "#endif" >>$outfile
    3192631963        fi
    3192731964        if test x"$g_atomic_lock_free" = xyes; then
    3192831965          echo >>$outfile
     
    3193231969        g_bit_sizes="16 32 64"
    3193331970        for bits in $g_bit_sizes; do
    3193431971          cat >>$outfile <<_______EOF
    31935 #define GINT${bits}_TO_${g_bs_native}(val)      ((gint${bits}) (val))
    31936 #define GUINT${bits}_TO_${g_bs_native}(val)     ((guint${bits}) (val))
    31937 #define GINT${bits}_TO_${g_bs_alien}(val)       ((gint${bits}) GUINT${bits}_SWAP_LE_BE (val))
    31938 #define GUINT${bits}_TO_${g_bs_alien}(val)      (GUINT${bits}_SWAP_LE_BE (val))
     31972#ifdef __BIG_ENDIAN__
     31973#define GINT${bits}_TO_BE(val)  ((gint${bits}) (val))
     31974#define GUINT${bits}_TO_BE(val) ((guint${bits}) (val))
     31975#define GINT${bits}_TO_LE(val)  ((gint${bits}) GUINT${bits}_SWAP_LE_BE (val))
     31976#define GUINT${bits}_TO_LE(val) (GUINT${bits}_SWAP_LE_BE (val))
     31977#else
     31978#define GINT${bits}_TO_LE(val)  ((gint${bits}) (val))
     31979#define GUINT${bits}_TO_LE(val) ((guint${bits}) (val))
     31980#define GINT${bits}_TO_BE(val)  ((gint${bits}) GUINT${bits}_SWAP_LE_BE (val))
     31981#define GUINT${bits}_TO_BE(val) (GUINT${bits}_SWAP_LE_BE (val))
     31982#endif
    3193931983_______EOF
    3194031984        done
    3194131985
    3194231986        cat >>$outfile <<_______EOF
    31943 #define GLONG_TO_LE(val)        ((glong) GINT${glongbits}_TO_LE (val))
    31944 #define GULONG_TO_LE(val)       ((gulong) GUINT${glongbits}_TO_LE (val))
    31945 #define GLONG_TO_BE(val)        ((glong) GINT${glongbits}_TO_BE (val))
    31946 #define GULONG_TO_BE(val)       ((gulong) GUINT${glongbits}_TO_BE (val))
     31987#ifdef __LP64__
     31988#define GLONG_TO_LE(val)        ((glong) GINT64_TO_LE (val))
     31989#define GULONG_TO_LE(val)       ((gulong) GUINT64_TO_LE (val))
     31990#define GLONG_TO_BE(val)        ((glong) GINT64_TO_BE (val))
     31991#define GULONG_TO_BE(val)       ((gulong) GUINT64_TO_BE (val))
     31992#else
     31993#define GLONG_TO_LE(val)        ((glong) GINT32_TO_LE (val))
     31994#define GULONG_TO_LE(val)       ((gulong) GUINT32_TO_LE (val))
     31995#define GLONG_TO_BE(val)        ((glong) GINT32_TO_BE (val))
     31996#define GULONG_TO_BE(val)       ((gulong) GUINT32_TO_BE (val))
     31997#endif
    3194731998#define GINT_TO_LE(val)         ((gint) GINT${gintbits}_TO_LE (val))
    3194831999#define GUINT_TO_LE(val)        ((guint) GUINT${gintbits}_TO_LE (val))
    3194932000#define GINT_TO_BE(val)         ((gint) GINT${gintbits}_TO_BE (val))
    3195032001#define GUINT_TO_BE(val)        ((guint) GUINT${gintbits}_TO_BE (val))
    31951 #define GSIZE_TO_LE(val)        ((gsize) GUINT${gsizebits}_TO_LE (val))
    31952 #define GSSIZE_TO_LE(val)       ((gssize) GINT${gsizebits}_TO_LE (val))
    31953 #define GSIZE_TO_BE(val)        ((gsize) GUINT${gsizebits}_TO_BE (val))
    31954 #define GSSIZE_TO_BE(val)       ((gssize) GINT${gsizebits}_TO_BE (val))
    31955 #define G_BYTE_ORDER $g_byte_order
     32002#ifdef __LP64__
     32003#define GSIZE_TO_LE(val)        ((gsize) GUINT64_TO_LE (val))
     32004#define GSSIZE_TO_LE(val)       ((gssize) GINT64_TO_LE (val))
     32005#define GSIZE_TO_BE(val)        ((gsize) GUINT64_TO_BE (val))
     32006#define GSSIZE_TO_BE(val)       ((gssize) GINT64_TO_BE (val))
     32007#else
     32008#define GSIZE_TO_LE(val)        ((gsize) GUINT32_TO_LE (val))
     32009#define GSSIZE_TO_LE(val)       ((gssize) GINT32_TO_LE (val))
     32010#define GSIZE_TO_BE(val)        ((gsize) GUINT32_TO_BE (val))
     32011#define GSSIZE_TO_BE(val)       ((gssize) GINT32_TO_BE (val))
     32012#endif
     32013#ifdef __BIG_ENDIAN__
     32014#define G_BYTE_ORDER G_BIG_ENDIAN
     32015#else
     32016#define G_BYTE_ORDER G_LITTLE_ENDIAN
     32017#endif
    3195632018
    3195732019#define GLIB_SYSDEF_POLLIN =$g_pollin
    3195832020#define GLIB_SYSDEF_POLLOUT =$g_pollout
Note: See TracBrowser for help on using the repository browser.