diff options
Diffstat (limited to 'meta/packages/pseudo/pseudo/tweakflags.patch')
| -rw-r--r-- | meta/packages/pseudo/pseudo/tweakflags.patch | 79 |
1 files changed, 79 insertions, 0 deletions
diff --git a/meta/packages/pseudo/pseudo/tweakflags.patch b/meta/packages/pseudo/pseudo/tweakflags.patch new file mode 100644 index 0000000000..fb31e05a1e --- /dev/null +++ b/meta/packages/pseudo/pseudo/tweakflags.patch @@ -0,0 +1,79 @@ +CFLAGS is overridden from the environment by Poky. We need boths sets of +flags so we adjust the Makefile accordingly. + +Also the default target is "test" which runs install which we don't want +until "make install" time when DESTDIR is set. Change the first target +to "all" for this reason. + +RP 18/3/10 + +Index: git/Makefile.in +=================================================================== +--- git.orig/Makefile.in 2010-03-17 16:05:17.000000000 +0000 ++++ git/Makefile.in 2010-03-18 18:49:37.000000000 +0000 +@@ -34,7 +34,7 @@ + CFLAGS_DEFS=-DPSEUDO_PREFIX='"$(PREFIX)"' -DPSEUDO_SUFFIX='"$(SUFFIX)"' -DPSEUDO_VERSION='"$(VERSION)"' + CFLAGS_DEBUG=-O2 -g + CFLAGS_SQL=-L$(SQLITE)/lib -I$(SQLITE)/include +-CFLAGS=$(CFLAGS_BASE) $(CFLAGS_CODE) $(CFLAGS_DEFS) \ ++EXTRA_CFLAGS=$(CFLAGS_BASE) $(CFLAGS_CODE) $(CFLAGS_DEFS) \ + $(CFLAGS_DEBUG) $(CFLAGS_SQL) + + GLOB_PATTERN=guts/*.c +@@ -47,11 +47,11 @@ + DBOBJS=pseudo_db.o -ldl -lpthread + WRAPOBJS=pseudo_wrappers.o + ++all: libpseudo.so pseudo pseudodb pseudolog ++ + test: install + @echo "No tests yet." + +-all: libpseudo.so pseudo pseudodb pseudolog +- + install-lib: libpseudo.so + mkdir -p $(DESTDIR)$(LIBDIR) + cp libpseudo*.so $(DESTDIR)$(LIBDIR) +@@ -66,26 +66,29 @@ + install: all install-lib install-bin install-data + + pseudo: pseudo.o $(SHOBJS) $(DBOBJS) pseudo_server.o pseudo_ipc.o +- $(CC) $(CFLAGS) -o pseudo \ ++ $(CC) $(CFLAGS) $(EXTRA_CFLAGS) -o pseudo \ + pseudo.o pseudo_server.o pseudo_client.o pseudo_ipc.o \ + $(DBOBJS) $(SHOBJS) $(DBLDFLAGS) + + pseudolog: pseudolog.o $(SHOBJS) $(DBOBJS) +- $(CC) $(CFLAGS) -o pseudolog pseudolog.o \ ++ $(CC) $(CFLAGS) $(EXTRA_CFLAGS) -o pseudolog pseudolog.o \ + $(DBOBJS) $(SHOBJS) $(DBLDFLAGS) + + pseudodb: pseudodb.o $(SHOBJS) $(DBOBJS) pseudo_ipc.o +- $(CC) $(CFLAGS) -o pseudodb pseudodb.o \ ++ $(CC) $(CFLAGS) $(EXTRA_CFLAGS) -o pseudodb pseudodb.o \ + $(DBOBJS) $(SHOBJS) $(DBLDFLAGS) pseudo_ipc.o + + libpseudo.so: $(WRAPOBJS) pseudo_client.o pseudo_ipc.o $(SHOBJS) +- $(CC) $(CFLAGS) -shared -o libpseudo.so \ ++ $(CC) $(CFLAGS) $(EXTRA_CFLAGS) -shared -o libpseudo.so \ + pseudo_client.o pseudo_ipc.o \ + $(WRAPOBJS) $(SHOBJS) -ldl + if test -n "$(SUFFIX)"; then \ + cp libpseudo.so libpseudo$(SUFFIX).so ; \ + fi + ++%.o: %.c ++ $(CC) -c $(CPPFLAGS) $(CFLAGS) $(EXTRA_CFLAGS) $< ++ + pseudo_client.o pseudo_server.o pseudo_ipc.o: pseudo_ipc.h + + pseudo_client.o: pseudo_client.h +@@ -103,7 +106,7 @@ + + # no-strict-aliasing is needed for the function pointer trickery. + pseudo_wrappers.o: pseudo_wrappers.c +- $(CC) -fno-strict-aliasing $(CFLAGS) -D_GNU_SOURCE -c -o pseudo_wrappers.o pseudo_wrappers.c ++ $(CC) -fno-strict-aliasing $(CFLAGS) $(EXTRA_CFLAGS) -D_GNU_SOURCE -c -o pseudo_wrappers.o pseudo_wrappers.c + + offsets32: + $(CC) -m32 -o offsets32 offsets.c |