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

2005-03-28 Tollef Fog Heen <tfheen@err.no>

Browse source 
Author: tfheen
Date: 2005-03-28 14:21:23 GMT
2005-03-28  Tollef Fog Heen  <tfheen@err.no>

    * autogen.sh: Extra paranoia -- fail if running auto* fails or if
    patching fails.

    * glib-patches/mkinstalldirs.update.diff: Update patch so it
    applies cleanly

    * glib-patches/pthread-config-fix.diff: adjust offsets so patch is
    quiet again
This commit is contained in:
Arch Librarian 2005-07-14 13:06:31 +00:00
parent ebcac020c9
commit b8125bf542
4 changed files with 20 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
ChangeLog
View file

@ -1,3 +1,14 @@
2005-03-28 Tollef Fog Heen <tfheen@err.no>
* autogen.sh: Extra paranoia -- fail if running auto* fails or if
patching fails.
* glib-patches/mkinstalldirs.update.diff: Update patch so it
applies cleanly
* glib-patches/pthread-config-fix.diff: adjust offsets so patch is
quiet again
2005-03-26 Tollef Fog Heen <tfheen@err.no>
* configure.in: Bump to 0.16

4
autogen.sh
View file

@ -75,9 +75,9 @@ perl -p -w -i.bak -e 's/if \(compare_func\(l1->data,l2->data\) < 0\)/if \(compar
# Update random auto* files to actually have something which have a snowball's
# chance in a hot place of working with modern auto* tools.
(cd glib-1.2.8 && for p in ../glib-patches/*.diff; do echo $p; patch -p1 < $p; done )
(cd glib-1.2.8 && for p in ../glib-patches/*.diff; do echo $p; patch -p1 < $p || exit 1; done ) || exit 1
(cd glib-1.2.8 && libtoolize --copy --force && $ACLOCAL $ACLOCAL_FLAGS && $AUTOMAKE && $AUTOCONF)
(cd glib-1.2.8 && libtoolize --copy --force && $ACLOCAL $ACLOCAL_FLAGS && $AUTOMAKE && $AUTOCONF) || exit 1
if test -z "$*"; then
echo "I am going to run ./configure with no arguments - if you wish "

6
glib-patches/mkinstalldirs.update.diff
View file

@ -1,5 +1,9 @@
#
# Update to mkinstalldirs from automake 1.7
#
--- glib-1.2.8/mkinstalldirs 2000-03-11 10:25:38.000000000 +0100
+++ glib-1.2.8-pkgconfig/mkinstalldirs 2005-02-20 23:26:36.579760784 +0100
+++ glib-1.2.8/mkinstalldirs 2004-06-20 10:56:22.000000000 +0200
@@ -4,37 +4,108 @@
# Created: 1993-05-16
# Public domain

4
glib-patches/pthread-config-fix.diff
View file

@ -1,6 +1,6 @@
--- glib-1.2.8/configure.in 2000-05-25 02:29:09.000000000 +0200
+++ glib-1.2.8/configure.in 2004-10-13 09:45:16.965305752 +0200
@@ -831,6 +831,7 @@
@@ -833,6 +833,7 @@
AC_MSG_CHECKING(whether pthread_cond_timedwait is posix like)
# DCE Threads return -1 as failure, posix ETIMEDOUT.
AC_TRY_RUN([#include <pthread.h>
@ -8,7 +8,7 @@
int main () {
pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER;
pthread_cond_t cond = PTHREAD_COND_INITIALIZER;
@@ -839,6 +840,7 @@
@@ -841,6 +842,7 @@
gettimeofday (&tval, NULL);
tspec.tv_sec = tval.tv_sec;
tspec.tv_nsec = 0;