Ticket #55577: glib2.diff

File glib2.diff, 2.3 KB (added by RJVB (René Bertin), 6 years ago)

  • devel/glib2/Portfile 

    diff --git a/devel/glib2/Portfile b/devel/glib2/Portfile
index bfbeac99f4..0233b3a458 100644
    a b configure.args --enable-static --disable-libelf \ 
    8889
    8990configure.perl              /usr/bin/perl
    9091configure.python            /usr/bin/python
    91 configure.env-append        PCRE_CFLAGS="-I${prefix}/include" \
    92                             PCRE_LIBS="-L${prefix}/lib -lpcre" \
    93                             PERL_PATH=${configure.perl} \
    94                             PKG_CONFIG=false \
    95                             ZLIB_CFLAGS="-I${prefix}/include" \
    96                             ZLIB_LIBS="-L${prefix}/lib -lz"
    9792
    9893post-patch {
    9994    reinplace "s|data_dirs = \"/usr|data_dirs = \"${prefix}/share:/usr|g" ${worksrcpath}/glib/gutils.c
    … … pre-configure { 
    110105    }
    111106
    112107    set libffi_version      [exec sed -n {s/Version: //p} ${prefix}/lib/pkgconfig/libffi.pc]
    113     configure.env-append    LIBFFI_CFLAGS="-I${prefix}/lib/libffi-${libffi_version}/include" \
     108    configure.env-append    PCRE_CFLAGS="[exec ${prefix}/bin/pkg-config --cflags libpcre]" \
     109                            PCRE_LIBS="[exec ${prefix}/bin/pkg-config --libs libpcre]" \
     110                            PERL_PATH=${configure.perl} \
     111                            PKG_CONFIG=false \
     112                            ZLIB_CFLAGS="[exec ${prefix}/bin/pkg-config --cflags zlib]" \
     113                            ZLIB_LIBS="[exec ${prefix}/bin/pkg-config --libs zlib]" \
     114                            LIBFFI_CFLAGS="-I${prefix}/lib/libffi-${libffi_version}/include" \
    114115                            LIBFFI_LIBS="-L${prefix}/lib -lffi"
    115116}
    116117

  • devel/glib2/files/patch-glib-2.0.pc.in.diff 

    diff --git a/devel/glib2/files/patch-glib-2.0.pc.in.diff b/devel/glib2/files/patch-glib-2.0.pc.in.diff
index 9d9c5b154f..b3e4c45b43 100644
    a b  
    55 Libs: -L${libdir} -lglib-2.0 @INTLLIBS@
    66 Libs.private: @G_THREAD_LIBS@ @G_LIBS_EXTRA@ @PCRE_LIBS@ @INTLLIBS@ @ICONV_LIBS@ @CARBON_LIBS@ @COCOA_LIBS@
    77-Cflags: -I${includedir}/glib-2.0 -I${libdir}/glib-2.0/include @GLIB_EXTRA_CFLAGS@
    8 +Cflags: -I${includedir}/glib-2.0 -I${libdir}/glib-2.0/include -I${includedir} @GLIB_EXTRA_CFLAGS@
     8+Cflags: -I${includedir}/glib-2.0 -I${libdir}/glib-2.0/include @PCRE_CFLAGS@ @GLIB_EXTRA_CFLAGS@