Changeset 97635


Ignore:
Timestamp:
Sep 10, 2012, 12:12:15 PM (7 years ago)
Author:
ryandesign@…
Message:

pkgconfig: update to 0.27.1; use internal glib, now that upstream issues with it have been resolved, and add a patch from the glib2 port to fix the universal build

Location:
trunk/dports/devel/pkgconfig
Files:
1 added
1 edited
2 copied

Legend:

Unmodified
Added
Removed
  • trunk/dports/devel/pkgconfig/Portfile

    r95441 r97635  
    55
    66name                pkgconfig
    7 version             0.27
     7version             0.27.1
    88categories          devel
    99maintainers         ryandesign
     
    2323                    used to compile and link against one or more libraries.
    2424
    25 checksums           rmd160  c47ec7442bf536af657fda2f8a63fc87206c33da \
    26                     sha256  79a6b43ee6633c9e6cc03eb1706370bb7a8450659845b782411f969eaba656a4
     25checksums           rmd160  ea01357dd1bcd40766123581c7f43fe59e41f4ac \
     26                    sha256  4f63d0df3035101b12949250da5231af49e3c3afcd8fb18554fa7c3cb92d8c17
    2727
    28 # Since 0.27, pkg-config once again provides a bundled copy of glib, which can
    29 # be activated using the --with-internal-glib flag. But it is unusable in its
    30 # present form because it fails to build universal:
    31 # gvariant.c:4241: error: size of array '_GStaticAssertCompileTimeAssertion_4241' is negative
    32 # https://bugs.freedesktop.org/show_bug.cgi?id=52032
    33 # And even if it succeeds building, it tries to install files that conflict
    34 # with the glib2 port:
    35 # ${prefix}/share/aclocal/glib-2.0.m4 ${prefix}/share/aclocal/glib-gettext.m4 ${prefix}/share/aclocal/gsettings.m4
    36 # https://bugs.freedesktop.org/show_bug.cgi?id=52031
    37 depends_lib         path:lib/pkgconfig/glib-2.0.pc:glib2
     28patchfiles          patch-glib-configure.diff
    3829
    3930set docdir          ${prefix}/share/doc/${name}
    4031
    4132configure.args      --with-pc-path=${prefix}/lib/pkgconfig:${prefix}/share/pkgconfig \
     33                    --with-internal-glib \
    4234                    --docdir=${docdir}
    4335
    44 configure.env       PKG_CONFIG=false \
    45                     GLIB_CFLAGS="-I${prefix}/include/glib-2.0 -I${prefix}/lib/glib-2.0/include -I${prefix}/include" \
    46                     GLIB_LIBS="-L${prefix}/lib -lglib-2.0 -lintl"
     36configure.env       PKG_CONFIG=false
     37
     38post-configure {
     39    system "ed - ${worksrcpath}/glib/config.h < ${filespath}/glib-config.h.ed"
     40}
    4741
    4842test.run            yes
  • trunk/dports/devel/pkgconfig/files/patch-glib-configure.diff

    r97631 r97635  
    1 --- configure.orig      2012-07-14 16:44:53.000000000 -0500
    2 +++ configure   2012-07-17 04:41:50.000000000 -0500
    3 @@ -5548,7 +5548,7 @@
     1--- glib/configure.orig 2012-08-24 07:34:14.000000000 -0500
     2+++ glib/configure      2012-09-09 17:10:58.000000000 -0500
     3@@ -5360,7 +5360,7 @@
    44 fi
    55 
     
    1010 
    1111  if test "x$with_runtime_libdir" != "x"; then
    12 @@ -30329,10 +30329,10 @@
     12@@ -27590,10 +27590,10 @@
    1313 *)                     glib_vacopy=''
    1414 esac
     
    2424 if test x$glib_cv_hasinline = xyes; then
    2525     glib_inline='#define G_HAVE_INLINE 1'
    26 @@ -32093,18 +32093,32 @@
     26@@ -29292,18 +29292,32 @@
    2727        cat >>$outfile <<_______EOF
    2828 #define G_HAVE_GINT64 1          /* deprecated, always true */
     
    6464         else
    6565          cat >>$outfile <<_______EOF
    66 @@ -32116,9 +32130,15 @@
     66@@ -29315,9 +29329,15 @@
    6767 
    6868         cat >>$outfile <<_______EOF
     
    8383 _______EOF
    8484 
    85 @@ -32146,18 +32166,33 @@
     85@@ -29345,18 +29365,33 @@
    8686        if test -z "$glib_unknown_void_p"; then
    8787          cat >>$outfile <<_______EOF
     
    126126        else
    127127          echo '#error SIZEOF_VOID_P unknown - This should never happen' >>$outfile
    128 @@ -32270,7 +32305,9 @@
     128@@ -29469,7 +29504,9 @@
    129129 
    130130        if test x"$g_memory_barrier_needed" != xno; then
     
    136136        if test x"$g_atomic_lock_free" = xyes; then
    137137           echo >>$outfile
    138 @@ -32280,27 +32317,52 @@
     138@@ -29479,27 +29516,52 @@
    139139        g_bit_sizes="16 32 64"
    140140        for bits in $g_bit_sizes; do
Note: See TracChangeset for help on using the changeset viewer.