fdo-mirrors/pkg-config
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pkg-config/pkg-config.git synced 2026-05-14 11:48:10 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

2002-09-13 Tor Lillqvist <tml@iki.fi>

Browse source 
Author: tml
Date: 2002-09-12 20:47:07 GMT
2002-09-13  Tor Lillqvist  <tml@iki.fi>

	* Makefile.am (USE_INSTALLED_GLIB): Seems that the automake
	version used by Havoc doesn't recognize pkg_config_CFLAGS and
	pkg_config_LDFLAGS, thus failing builds on Win32 directly from the
	tarball. Set included_glib_includes and pkg_config_LDADD instead,
	then, like in the !USE_INSTALLED_GLIB branch.

	* findme.c (X_OK): If X_OK undefined, define as 1, always, not
	only if G_OS_WIN32, which is never defined here. Fixes a corner
	case on Win32 with MSYS and mingw where configure as included in
	the release tarball for some reason doesn't find unistd.h.
This commit is contained in:
Arch Librarian 2005-07-14 13:05:20 +00:00
parent d2c6c3cccb
commit d793148d06
4 changed files with 33 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
ChangeLog
View file

@ -1,3 +1,16 @@
2002-09-13 Tor Lillqvist <tml@iki.fi>
* Makefile.am (USE_INSTALLED_GLIB): Seems that the automake
version used by Havoc doesn't recognize pkg_config_CFLAGS and
pkg_config_LDFLAGS, thus failing builds on Win32 directly from the
tarball. Set included_glib_includes and pkg_config_LDADD instead,
then, like in the !USE_INSTALLED_GLIB branch.
* findme.c (X_OK): If X_OK undefined, define as 1, always, not
only if G_OS_WIN32, which is never defined here. Fixes a corner
case on Win32 with MSYS and mingw where configure as included in
the release tarball for some reason doesn't find unistd.h.
2002-09-09 Havoc Pennington <hp@pobox.com>
* pkg.c (fill_list_single_package): fix uninitialized variable,

4
Makefile.am
View file

@ -1,6 +1,6 @@
if USE_INSTALLED_GLIB
pkg_config_CFLAGS = @GLIB_CFLAGS@
pkg_config_LDFLAGS = @GLIB_LIBS@
included_glib_includes = @GLIB_CFLAGS@
pkg_config_LDADD=@GLIB_LIBS@
else
SUBDIRS = glib-1.2.8
included_glib_includes = -I./glib-1.2.8

32
README.win32
View file

@ -1,11 +1,11 @@
pkg-config on Win32
===================
This file describes pkg-config for "pure" Win32. (With Cygwin,
pkg-config 0.8.0 builds fine right out of the box. Cygwin is just
another Unix variant, as far as pkg-config is concerned.) I don't to
call this "pure" Win32 target mingw, as pkg-config is usable also by
MSVC users.
This file describes pkg-config for "native" Win32. (On Cygwin,
pkg-config builds fine right out of the box. Cygwin is just another
Unix variant, as far as pkg-config is concerned.) I don't call this
"native" Win32 target MinGW, as pkg-config on Windows is supposed to
be useable also by MSVC users.
There should be no compile-time paths built into the executable of
pkg-config. Likewise, not in the libraries it describes either.
@ -38,13 +38,15 @@ site. This works as long as the .pc file uses the variable name
GTK does this.
On Unix, pkg-config is built using its own copy of GLib 1.2.8. On
Windows, we use the normal GLib available for Windows (1.3.10
currently). Yes, this does introduce a circular dependency, but that
can be worked around. The circular dependency only appears if one uses
the configure mechanism to build GLib. GLib's configure script checks
for pkg-config. pkg-config depends on GLib. Thus, starting from
scratch, with no GLib and no pkg-config, using configure, there would
indeed be a Catch-22 situation. However, GLib can be built just fine
using the manually written makefiles for mingw or MSVC. And if
somebody does want to build GLib on Win32 using configure, she can
first install a prebuilt pkgconfig.
Windows, we use the normal GLib available for Windows (2.0.x). Yes,
this does introduce a kind of circular dependency. But, that can be
worked around. The circular dependency only appears if one uses the
configure mechanism to build GLib. GLib's configure script checks for
pkg-config. pkg-config depends on GLib. Thus, starting from scratch,
with no GLib and no pkg-config, using configure, there would indeed be
a Catch-22 situation. However, GLib can be built just fine using the
manually written makefiles for mingw or MSVC. And if somebody does
want to build GLib on Win32 using configure, she can first install a
prebuilt pkgconfig.
--Tor Lillqvist <tml@iki.fi>

2
findme.c
View file

@ -44,7 +44,7 @@
#include "findme.h"
#if defined(G_OS_WIN32) && !defined(X_OK)
#if !defined(X_OK)
#define X_OK 1
#endif