iozone3: Fix parallel build problem

ibasync.o and libbif.o are built twice once wrongly
without CFLAGS, clang catches this since it does not specify
-DHAVE_ANSIC_C and clang flags bunch of errors.

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
This commit is contained in:
Khem Raj
2016-12-05 18:36:25 -08:00
committed by Martin Jansa
parent b0493d4ccf
commit 684c76f0e3
2 changed files with 99 additions and 0 deletions
@@ -0,0 +1,97 @@
remove libasync.o and libbif.o from deps
there are no implicit rules to build them and they get wrong CFLAGS
when compiled with implicit rule.
They are built as part of iozone_linux.o target anyway
Only fixed linux targets for now
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Upstream-Status: Pending
--- current/makefile.org 2016-12-06 02:19:10.367911020 +0000
+++ current/makefile 2016-12-06 02:21:38.767911020 +0000
@@ -167,7 +167,7 @@
#
# GNU 'C' compiler Linux build with threads, largefiles, async I/O
#
-linux: iozone_linux.o libasync.o libbif.o fileop_linux.o pit_server.o
+linux: iozone_linux.o fileop_linux.o pit_server.o
$(CC) -O3 $(LDFLAGS) iozone_linux.o libasync.o libbif.o -lpthread \
-lrt -o iozone
$(CC) -O3 -Dlinux fileop_linux.o -o fileop
@@ -176,7 +176,7 @@
#
# GNU 'C' compiler Linux build for powerpc chip with threads, largefiles, async I/O
#
-linux-powerpc: iozone_linux-powerpc.o libbif.o libasync.o fileop_linux-ppc.o pit_server.o
+linux-powerpc: iozone_linux-powerpc.o fileop_linux-ppc.o pit_server.o
$(CC) -O3 $(LDFLAGS) iozone_linux-powerpc.o libasync.o \
libbif.o -lpthread -lrt -o iozone
$(CC) -O3 -Dlinux fileop_linux-ppc.o -o fileop
@@ -184,7 +184,7 @@
#
# GNU 'C' compiler Linux build for sparc chip with threads, largefiles, async I/O
#
-linux-sparc: iozone_linux-sparc.o libbif.o libasync.o fileop_linux.o pit_server.o
+linux-sparc: iozone_linux-sparc.o fileop_linux.o pit_server.o
$(CC) -O3 $(LDFLAGS) iozone_linux-sparc.o libasync.o libbif.o \
-lpthread -lrt -o iozone
$(CC) -O3 -Dlinux fileop_linux.o -o fileop
@@ -193,7 +193,7 @@
#
# GNU 'C' compiler Linux build with threads, largefiles, async I/O
#
-linux-ia64: iozone_linux-ia64.o libbif.o libasync.o fileop_linux-ia64.o pit_server.o
+linux-ia64: iozone_linux-ia64.o fileop_linux-ia64.o pit_server.o
$(CC) -O3 $(LDFLAGS) iozone_linux-ia64.o libbif.o libasync.o \
-lrt -lpthread -o iozone
$(CC) -O3 -Dlinux fileop_linux-ia64.o -o fileop
@@ -202,7 +202,7 @@
#
# GNU 'C' compiler Linux build for powerpc chip with threads, largefiles, async I/O
#
-linux-powerpc64: iozone_linux-powerpc64.o libbif.o libasync.o fileop_linux-ppc64.o pit_server-linux-powerpc64.o
+linux-powerpc64: iozone_linux-powerpc64.o fileop_linux-ppc64.o pit_server-linux-powerpc64.o
$(CC) -O3 -Dunix -DHAVE_ANSIC_C -DSHARED_MEM -DASYNC_IO \
-D_LARGEFILE64_SOURCE -Dlinux \
iozone_linux-powerpc64.o libasync.o libbif.o -lpthread \
@@ -213,7 +213,7 @@
#
# GNU 'C' compiler Linux build with threads, largefiles, async I/O
#
-linux-arm: iozone_linux-arm.o libbif.o libasync.o fileop_linux-arm.o pit_server.o
+linux-arm: iozone_linux-arm.o fileop_linux-arm.o pit_server.o
$(CC) -O3 $(LDFLAGS) iozone_linux-arm.o libbif.o libasync.o \
-lrt -lpthread -o iozone
$(CC) -O3 -Dlinux fileop_linux-arm.o -o fileop
@@ -222,7 +222,7 @@
#
# GNU 'C' compiler Linux build with threads, largefiles, async I/O
#
-linux-AMD64: iozone_linux-AMD64.o libbif.o libasync.o fileop_linux-AMD64.o pit_server.o
+linux-AMD64: iozone_linux-AMD64.o fileop_linux-AMD64.o pit_server.o
$(CC) -O3 $(LDFLAGS) iozone_linux-AMD64.o libbif.o libasync.o \
-lrt -lpthread -o iozone
$(CC) -O3 -Dlinux fileop_linux-AMD64.o -o fileop
@@ -231,7 +231,7 @@
#
# GNU 'C' compiler Linux build with S/390, threads, largfiles, async I/O
#
-linux-S390: iozone_linux-s390.o libbif.o libasync.o fileop_linux-s390.o pit_server.o
+linux-S390: iozone_linux-s390.o fileop_linux-s390.o pit_server.o
$(CC) -O2 $(LDFLAGS) -lpthread -lrt iozone_linux-s390.o \
libbif.o libasync.o -o iozone
$(CC) -O3 -Dlinux fileop_linux-s390.o -o fileop
@@ -240,7 +240,7 @@
#
# GNU 'C' compiler Linux build with S/390, threads, largfiles, async I/O
#
-linux-S390X: iozone_linux-s390x.o libbif.o libasync.o fileop_linux-s390x.o pit_server.o
+linux-S390X: iozone_linux-s390x.o fileop_linux-s390x.o pit_server.o
$(CC) -O2 $(LDFLAGS) -lpthread -lrt iozone_linux-s390x.o \
libbif.o libasync.o -o iozone
$(CC) -O3 -Dlinux fileop_linux-s390x.o -o fileop
@@ -7,6 +7,7 @@ LIC_FILES_CHKSUM = "file://iozone.c;beginline=37;endline=48;md5=7331260091868dca
file://iozone.c;beginline=260;endline=266;md5=77f9ee51e45b57a7e7519c4fa0b4f00b \
"
SRC_URI = "http://www.iozone.org/src/current/${BPN}_${PV}.tar \
file://parallelism.patch \
file://copyright.txt \
"
SRC_URI[md5sum] = "c924e5e46fb1cf8145f420e8e57eb954"
@@ -21,6 +22,7 @@ S = "${WORKDIR}/${BPN}_${PV}/src/current/"
#
EXTRA_OEMAKE_powerpc = "linux-powerpc CC='${CC}' GCC='${CC}'"
EXTRA_OEMAKE_powerpc64 = "linux-powerpc64 CC='${CC}' GCC='${CC}'"
EXTRA_OEMAKE_x86-64 = "linux-AMD64 CC='${CC}' GCC='${CC}'"
EXTRA_OEMAKE_arm = "linux-arm CC='${CC}' GCC='${CC}'"
EXTRA_OEMAKE = "linux CC='${CC}' GCC='${CC}'"