Commit a507db95 authored by Anthony Liguori's avatar Anthony Liguori
Browse files

Merge remote-tracking branch 'kraxel/pixman.v6' into staging 



* kraxel/pixman.v6:
  pixman: pass extra cflags and ldflags

Signed-off-by: default avatarAnthony Liguori <aliguori@us.ibm.com>
parents b55160c3 f9943cd5

Makefile

+1 −1
Original line number Diff line number Diff line
@@ -128,7 +128,7 @@ subdir-pixman: pixman/Makefile 
	$(call quiet-command,$(MAKE) $(SUBDIR_MAKEFLAGS) -C pixman V="$(V)" all,)



pixman/Makefile: $(SRC_PATH)/pixman/configure

	(cd pixman; CFLAGS="$(CFLAGS) -fPIC" $(SRC_PATH)/pixman/configure $(AUTOCONF_HOST) --disable-gtk --disable-shared --enable-static)

	(cd pixman; CFLAGS="$(CFLAGS) -fPIC $(extra_cflags) $(extra_ldflags)" $(SRC_PATH)/pixman/configure $(AUTOCONF_HOST) --disable-gtk --disable-shared --enable-static)



$(SRC_PATH)/pixman/configure:

	(cd $(SRC_PATH)/pixman; autoreconf -v --install)

configure

+4 −0
Original line number Diff line number Diff line
@@ -239,8 +239,10 @@ for opt do 
  --cpu=*) cpu="$optarg"

  ;;

  --extra-cflags=*) QEMU_CFLAGS="$optarg $QEMU_CFLAGS"

                    EXTRA_CFLAGS="$optarg"

  ;;

  --extra-ldflags=*) LDFLAGS="$optarg $LDFLAGS"

                     EXTRA_LDFLAGS="$optarg"

  ;;

  --enable-debug-info) debug_info="yes"

  ;;
@@ -3334,6 +3336,8 @@ echo "qemu_datadir=$qemu_datadir" >> $config_host_mak 
echo "qemu_docdir=$qemu_docdir" >> $config_host_mak

echo "qemu_localstatedir=$local_statedir" >> $config_host_mak

echo "qemu_helperdir=$libexecdir" >> $config_host_mak

echo "extra_cflags=$EXTRA_CFLAGS" >> $config_host_mak

echo "extra_ldflags=$EXTRA_LDFLAGS" >> $config_host_mak



echo "ARCH=$ARCH" >> $config_host_mak

if test "$debug_tcg" = "yes" ; then