diff options
| author | Alyssa Ross <hi@alyssa.is> | 2019-01-07 02:18:36 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2019-01-07 02:18:47 +0000 |
| commit | 36f56d99fa0a0765c9f1de4a5f17a9b05830c3f2 (patch) | |
| tree | b3faaf573407b32aa645237a4d16b82778a39a92 /nixpkgs/pkgs/development/libraries/libmhash/autotools-define-conflict-debian-fix.patch | |
| parent | 4e31070265257dc67d120c27e0f75c2344fdfa9a (diff) | |
| parent | abf060725d7614bd3b9f96764262dfbc2f9c2199 (diff) | |
| download | nixlib-36f56d99fa0a0765c9f1de4a5f17a9b05830c3f2.tar nixlib-36f56d99fa0a0765c9f1de4a5f17a9b05830c3f2.tar.gz nixlib-36f56d99fa0a0765c9f1de4a5f17a9b05830c3f2.tar.bz2 nixlib-36f56d99fa0a0765c9f1de4a5f17a9b05830c3f2.tar.lz nixlib-36f56d99fa0a0765c9f1de4a5f17a9b05830c3f2.tar.xz nixlib-36f56d99fa0a0765c9f1de4a5f17a9b05830c3f2.tar.zst nixlib-36f56d99fa0a0765c9f1de4a5f17a9b05830c3f2.zip | |
Add 'nixpkgs/' from commit 'abf060725d7614bd3b9f96764262dfbc2f9c2199'
git-subtree-dir: nixpkgs git-subtree-mainline: 4e31070265257dc67d120c27e0f75c2344fdfa9a git-subtree-split: abf060725d7614bd3b9f96764262dfbc2f9c2199
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/libmhash/autotools-define-conflict-debian-fix.patch')
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/libmhash/autotools-define-conflict-debian-fix.patch | 78 |
1 files changed, 78 insertions, 0 deletions
diff --git a/nixpkgs/pkgs/development/libraries/libmhash/autotools-define-conflict-debian-fix.patch b/nixpkgs/pkgs/development/libraries/libmhash/autotools-define-conflict-debian-fix.patch new file mode 100644 index 000000000000..1e3a5d680df6 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/libmhash/autotools-define-conflict-debian-fix.patch @@ -0,0 +1,78 @@ +Patch fixing #DEFINE redefinitions for generic PACKAGE_* attributes which +cause collisions when using libmhash in another package also using autotools. + +Debian Bug report #473204 + +diff -x configure -x config.guess -x config.sub -x 'Makefile.*' -Nru +mhash-0.9.9.orig/configure.in mhash-0.9.9/configure.in +--- mhash-0.9.9.orig/configure.in 2007-04-04 19:22:28.000000000 -0700 ++++ mhash-0.9.9/configure.in 2008-03-29 00:21:24.000000000 -0800 +@@ -6,6 +6,7 @@ + AM_INIT_AUTOMAKE + + AC_DEFINE([MHASH_VERSION], PROGRAM_VERSION, "MHash Version") ++AC_CONFIG_HEADER([include/mutils/config.h]) + AC_CONFIG_HEADER([include/mutils/mhash_config.h]) + + +diff -x configure -x config.guess -x config.sub -x 'Makefile.*' -Nru +mhash-0.9.9.orig/include/mutils/config.h.in +mhash-0.9.9/include/mutils/config.h.in +--- mhash-0.9.9.orig/include/mutils/config.h.in 1969-12-31 16:00:00.000000000 +-0800 ++++ mhash-0.9.9/include/mutils/config.h.in 2008-03-29 00:48:22.000000000 +-0800 +@@ -0,0 +1,22 @@ ++/* Name of package */ ++#undef PACKAGE ++ ++/* Define to the address where bug reports for this package should be sent. */ ++#undef PACKAGE_BUGREPORT ++ ++/* Define to the full name of this package. */ ++#undef PACKAGE_NAME ++ ++/* Define to the full name and version of this package. */ ++#undef PACKAGE_STRING ++ ++/* Define to the one symbol short name of this package. */ ++#undef PACKAGE_TARNAME ++ ++/* Define to the version of this package. */ ++#undef PACKAGE_VERSION ++ ++/* Version number of package */ ++#undef VERSION ++ ++ +diff -x configure -x config.guess -x config.sub -x 'Makefile.*' -Nru +mhash-0.9.9.orig/include/mutils/mhash_config.h.in +mhash-0.9.9/include/mutils/mhash_config.h.in +--- mhash-0.9.9.orig/include/mutils/mhash_config.h.in 2008-03-29 +00:23:29.000000000 -0800 ++++ mhash-0.9.9/include/mutils/mhash_config.h.in 2008-03-29 +00:06:41.000000000 -0800 +@@ -181,24 +181,6 @@ + /* Define to 1 if your C compiler doesn't accept -c and -o together. */ + #undef NO_MINUS_C_MINUS_O + +-/* Name of package */ +-#undef PACKAGE +- +-/* Define to the address where bug reports for this package should be sent. */ +-#undef PACKAGE_BUGREPORT +- +-/* Define to the full name of this package. */ +-#undef PACKAGE_NAME +- +-/* Define to the full name and version of this package. */ +-#undef PACKAGE_STRING +- +-/* Define to the one symbol short name of this package. */ +-#undef PACKAGE_TARNAME +- +-/* Define to the version of this package. */ +-#undef PACKAGE_VERSION +- + /* Define to 1 if the C compiler supports function prototypes. */ + #undef PROTOTYPES |