[pacman-dev] [PATCH 1/2] Fix typo in acinclude.m4 fs_old_*flags
Introduced in commit d2669b47. Signed-off-by: Dan McGee <dan@archlinux.org> --- m4/acinclude.m4 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/m4/acinclude.m4 b/m4/acinclude.m4 index f57a515..e601f0e 100644 --- a/m4/acinclude.m4 +++ b/m4/acinclude.m4 @@ -58,11 +58,11 @@ AC_DEFUN([GCC_FORTIFY_SOURCE_CC],[ } ], [ AC_MSG_RESULT(yes) - CFLAGS="$df_old_cflags" + CFLAGS="$fs_old_cflags" ], [ AC_MSG_RESULT(no) - CPPFLAGS="$df_old_cppflags" - CFLAGS="$df_old_cflags" + CPPFLAGS="$fs_old_cppflags" + CFLAGS="$fs_old_cflags" ]) fi ]) -- 1.7.12
Since commit d2669b47, CFLAGS specified on the command line haven't been respected at all, resulting in no optimization being applied to builds. This exposed one warning flag issue in some new code, which is also fixed here. Signed-off-by: Dan McGee <dan@archlinux.org> --- configure.ac | 2 +- src/pacman/query.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index 7fe696a..2d7580e 100644 --- a/configure.ac +++ b/configure.ac @@ -67,7 +67,7 @@ LIB_VERSION=`expr lib_current - lib_age`.lib_age.lib_revision LIB_VERSION_INFO="lib_current:lib_revision:lib_age" # Respect empty CFLAGS during compiler tests -if test "x$CFLAGS" != "x"; then +if test "x$CFLAGS" = "x"; then CFLAGS="" fi diff --git a/src/pacman/query.c b/src/pacman/query.c index fc2c90c..398adac 100644 --- a/src/pacman/query.c +++ b/src/pacman/query.c @@ -134,7 +134,7 @@ static int query_fileowner(alpm_list_t *targets) struct stat buf; alpm_list_t *i; size_t len; - int found = 0; + unsigned int found = 0; if((filename = strdup(t->data)) == NULL) { goto targcleanup; -- 1.7.12
On 19/09/12 12:34, Dan McGee wrote:
Since commit d2669b47, CFLAGS specified on the command line haven't been respected at all, resulting in no optimization being applied to builds. This exposed one warning flag issue in some new code, which is also fixed here.
Signed-off-by: Dan McGee <dan@archlinux.org> --- configure.ac | 2 +- src/pacman/query.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/configure.ac b/configure.ac index 7fe696a..2d7580e 100644 --- a/configure.ac +++ b/configure.ac @@ -67,7 +67,7 @@ LIB_VERSION=`expr lib_current - lib_age`.lib_age.lib_revision LIB_VERSION_INFO="lib_current:lib_revision:lib_age"
# Respect empty CFLAGS during compiler tests -if test "x$CFLAGS" != "x"; then +if test "x$CFLAGS" = "x"; then CFLAGS="" fi
diff --git a/src/pacman/query.c b/src/pacman/query.c index fc2c90c..398adac 100644 --- a/src/pacman/query.c +++ b/src/pacman/query.c @@ -134,7 +134,7 @@ static int query_fileowner(alpm_list_t *targets) struct stat buf; alpm_list_t *i; size_t len; - int found = 0; + unsigned int found = 0;
if((filename = strdup(t->data)) == NULL) { goto targcleanup;
Ack... Turns out the combination of both the stuff ups in that commit fixed the bug I was trying to fix! :P
participants (2)
-
Allan McRae
-
Dan McGee