ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-11-11 15:27:20 +03:00
Code Issues Projects Releases Wiki Activity

* Patch to make glib 1.2 compile with gcc 3.4.

Browse Source 
svn path=/nixpkgs/trunk/; revision=1486
This commit is contained in:
Eelco Dolstra 2004-09-22 08:32:42 +00:00
parent 9bdb07a79a
commit f39238ad9f
2 changed files with 23 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkgs/development/libraries/gtk-libs-1.x/glib/default.nix
View File

@ -6,4 +6,7 @@ stdenv.mkDerivation {
url = ftp://ftp.gtk.org/pub/gtk/v1.2/glib-1.2.10.tar.gz;
md5 = "6fe30dad87c77b91b632def29dd69ef9";
};
# Patch for gcc 3.4 compatibility. Based on
# http://cvs.openpkg.org/chngview?cn=16208.
patches = [./gcc34.patch];
}

20
pkgs/development/libraries/gtk-libs-1.x/glib/gcc34.patch Normal file
View File

@ -0,0 +1,20 @@
diff -rc glib-orig/glib.h glib-1.2.10/glib.h
*** glib-orig/glib.h 2001-02-27 04:44:38.000000000 +0100
--- glib-1.2.10/glib.h 2004-09-22 10:22:01.000000000 +0200
***************
*** 272,278 ****
/* Wrap the gcc __PRETTY_FUNCTION__ and __FUNCTION__ variables with
* macros, so we can refer to them as strings unconditionally.
*/
! #ifdef __GNUC__
#define G_GNUC_FUNCTION __FUNCTION__
#define G_GNUC_PRETTY_FUNCTION __PRETTY_FUNCTION__
#else /* !__GNUC__ */
--- 272,278 ----
/* Wrap the gcc __PRETTY_FUNCTION__ and __FUNCTION__ variables with
* macros, so we can refer to them as strings unconditionally.
*/
! #if defined(__GNUC__) && (__GNUC__ == 3 && __GNUC_MINOR__ < 4)
#define G_GNUC_FUNCTION __FUNCTION__
#define G_GNUC_PRETTY_FUNCTION __PRETTY_FUNCTION__
#else /* !__GNUC__ */