Recent changes (master)
The following changes since commit dd9bd2b2e0ed9665325240fdd5a40253fe23bca6:
Fixup t/ test apps for lfsr_next change() (2014-11-24 08:07:03 -0700)
are available in the git repository at:
git://git.kernel.dk/fio.git master
for you to fetch changes up to 867198458145fc405d1925e339719f779fb671c2:
Make gfio build with --build-static (2014-11-25 16:02:52 -0700)
----------------------------------------------------------------
Jens Axboe (1):
Make gfio build with --build-static
Makefile | 2 +- configure | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-)
---
Diff of recent changes:
Makefile +1 -1
@@ -334,7 +334,7 @@ fio: $(FIO_OBJS) $(QUIET_LINK)$(CC) $(LDFLAGS) $(CFLAGS) -o $@ $(FIO_OBJS) $(LIBS) $(HDFSLIB) gfio: $(GFIO_OBJS) - $(QUIET_LINK)$(CC) $(LDFLAGS) -o gfio $(GFIO_OBJS) $(LIBS) $(GTK_LDFLAGS) + $(QUIET_LINK)$(CC) $(filter-out -static, $(LDFLAGS)) -o gfio $(GFIO_OBJS) $(LIBS) $(GFIO_LIBS) $(GTK_LDFLAGS) t/fio-genzipf: $(T_ZIPF_OBJS) $(QUIET_LINK)$(CC) $(LDFLAGS) $(CFLAGS) -o $@ $(T_ZIPF_OBJS) $(LIBS)
configure +5 -1
@@ -1010,6 +1010,8 @@ int main(void) } EOF GTK_CFLAGS=$(pkg-config --cflags gtk+-2.0 gthread-2.0) +ORG_LDFLAGS=$LDFLAGS +LDFLAGS=$(echo $LDFLAGS | sed s/"-static"//g) if test "$?" != "0" ; then echo "configure: gtk and gthread not found" exit 1
@@ -1023,7 +1025,7 @@ if compile_prog "$GTK_CFLAGS" "$GTK_LIBS" "gfio" ; then r=$($TMPE) if test "$r" != "0" ; then gfio="yes" - LIBS="$LIBS $GTK_LIBS" + GFIO_LIBS="$LIBS $GTK_LIBS" CFLAGS="$CFLAGS $GTK_CFLAGS" else echo "GTK found, but need version 2.18 or higher"
@@ -1033,6 +1035,7 @@ else echo "Please install gtk and gdk libraries" gfio="no" fi +LDFLAGS=$ORG_LDFLAGS fi if test "$gfio_check" = "yes" ; then
@@ -1578,6 +1581,7 @@ if test "$zlib" = "no" ; then fi echo "LIBS+=$LIBS" >> $config_host_mak +echo "GFIO_LIBS+=$GFIO_LIBS" >> $config_host_mak echo "CFLAGS+=$CFLAGS" >> $config_host_mak echo "LDFLAGS+=$LDFLAGS" >> $config_host_mak echo "CC=$cc" >> $config_host_mak