luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-12-24 14:36:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

Beef up Libs.private in glib-2.0.pc

Browse Source 
This should help getting static builds working on mingw.
Based on a patch by Volker Grabsch, bug 619126.

At the same time, drop the unnecessary GLIB_RT_LIBS variable;
we are already adding -lrt to G_THREAD_LIBS.
This commit is contained in:
Matthias Clasen 2012-01-15 22:15:10 -05:00
parent 7e542e97a9
commit 5377c0de01
4 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
configure.ac
View File

@ -2286,10 +2286,8 @@ AC_CHECK_FUNCS(clock_gettime, [], [
AC_DEFINE(HAVE_CLOCK_GETTIME, 1) AC_DEFINE(HAVE_CLOCK_GETTIME, 1)
G_THREAD_LIBS="$G_THREAD_LIBS -lrt" G_THREAD_LIBS="$G_THREAD_LIBS -lrt"
G_THREAD_LIBS_FOR_GTHREAD="$G_THREAD_LIBS_FOR_GTHREAD -lrt" G_THREAD_LIBS_FOR_GTHREAD="$G_THREAD_LIBS_FOR_GTHREAD -lrt"
GLIB_RT_LIBS="-lrt"
]) ])
]) ])
AC_SUBST(GLIB_RT_LIBS)
dnl ************************ dnl ************************
@ -2526,7 +2524,7 @@ case $host in
G_LIBS_EXTRA="-luser32 -lkernel32" G_LIBS_EXTRA="-luser32 -lkernel32"
;; ;;
*-*-mingw*) *-*-mingw*)
G_LIBS_EXTRA="-lws2_32 -lole32 -lwinmm" G_LIBS_EXTRA="-lws2_32 -lole32 -lwinmm -lshlwapi"
;; ;;
*) *)
G_LIBS_EXTRA="" G_LIBS_EXTRA=""

2
gio-2.0.pc.in
View File

@ -10,7 +10,7 @@ glib_compile_resources=@bindir@/glib-compile-resources@EXEEXT@
Name: GIO Name: GIO
Description: glib I/O library Description: glib I/O library
Version: @VERSION@ Version: @VERSION@
Requires: glib-2.0,gobject-2.0 Requires: glib-2.0 gobject-2.0
Requires.private: gmodule-no-export-2.0 Requires.private: gmodule-no-export-2.0
Libs: -L${libdir} -lgio-2.0 Libs: -L${libdir} -lgio-2.0
Libs.private: @ZLIB_LIBS@ @NETWORK_LIBS@ Libs.private: @ZLIB_LIBS@ @NETWORK_LIBS@

2
glib-2.0.pc.in
View File

@ -12,5 +12,5 @@ Description: C Utility Library
Version: @VERSION@ Version: @VERSION@
Requires.private: @PCRE_REQUIRES@ Requires.private: @PCRE_REQUIRES@
Libs: -L${libdir} -lglib-2.0 @INTLLIBS@ Libs: -L${libdir} -lglib-2.0 @INTLLIBS@
Libs.private: @ICONV_LIBS@ @GLIB_RT_LIBS@ Libs.private: @G_THREAD_LIBS@ @G_LIBS_EXTRA@ @PCRE_LIBS@ @INTLLIBS@ @ICONV_LIBS@
Cflags: -I${includedir}/glib-2.0 -I${libdir}/glib-2.0/include @GLIB_EXTRA_CFLAGS@ Cflags: -I${includedir}/glib-2.0 -I${libdir}/glib-2.0/include @GLIB_EXTRA_CFLAGS@

2
glib/Makefile.am
View File

@ -380,7 +380,7 @@ pcre_lib =
pcre_inc = pcre_inc =
endif endif
libglib_2_0_la_LIBADD = libcharset/libcharset.la $(printf_la) @GIO@ @GSPAWN@ @PLATFORMDEP@ @ICONV_LIBS@ @G_LIBS_EXTRA@ $(pcre_lib) $(GLIB_RT_LIBS) $(G_THREAD_LIBS_EXTRA) $(G_THREAD_LIBS_FOR_GTHREAD) libglib_2_0_la_LIBADD = libcharset/libcharset.la $(printf_la) @GIO@ @GSPAWN@ @PLATFORMDEP@ @ICONV_LIBS@ @G_LIBS_EXTRA@ $(pcre_lib) $(G_THREAD_LIBS_EXTRA) $(G_THREAD_LIBS_FOR_GTHREAD)
libglib_2_0_la_DEPENDENCIES = libcharset/libcharset.la $(printf_la) @GIO@ @GSPAWN@ @PLATFORMDEP@ $(glib_win32_res) $(glib_def) libglib_2_0_la_DEPENDENCIES = libcharset/libcharset.la $(printf_la) @GIO@ @GSPAWN@ @PLATFORMDEP@ $(glib_win32_res) $(glib_def)
libglib_2_0_la_LDFLAGS = $(GLIB_LINK_FLAGS) \ libglib_2_0_la_LDFLAGS = $(GLIB_LINK_FLAGS) \