* Dan McGee's makepkg updates http://www.archlinux.org/pipermail/pacman-dev/2006-December/000792.html

* configure fixes (CFLAGS)
* no-strict-aliasing hacks until full C99 compliance
* --with-config-file configure option

2 files changed, 4 insertions, 2 deletions

diff --git a/lib/libalpm/Makefile.am b/lib/libalpm/Makefile.am
index dbdc24db..9f555d22 100644
--- a/lib/libalpm/Makefile.am
+++ b/lib/libalpm/Makefile.am
@@ -1,6 +1,8 @@
 AUTOMAKE_OPTIONS = gnu
 DEFINES = -pedantic -D_GNU_SOURCE
-AM_CFLAGS = $(DEFINES)
+#libalpm isn't fully C99 safe with the strict aliasing rules
+# to be fixed in the future
+AM_CFLAGS = $(DEFINES) -fno-strict-aliasing
 SUBDIRS = po
 
 localedir = $(datadir)/locale
diff --git a/lib/libalpm/add.c b/lib/libalpm/add.c
index 957cd69b..51029d6d 100644
--- a/lib/libalpm/add.c
+++ b/lib/libalpm/add.c
@@ -250,7 +250,7 @@ int _alpm_add_prepare(pmtrans_t *trans, pmdb_t *db, pmlist_t **data)
 			QUESTION(trans, PM_TRANS_CONV_CONFLICT_PKG, miss->target, miss->depend.name, NULL, &skip_this);
 			if(skip_this) {
 				pmpkg_t *pkg = NULL;
-				lp = _alpm_list_remove(lp, miss->depend.name, name_cmp, (void **)&pkg);
+				lp = _alpm_list_remove(lp, (void *)miss->depend.name, name_cmp, (void **)&pkg);
 				FREEPKG(pkg);
 			}
 		}