diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2013-04-16 09:03:48 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2013-04-16 09:06:48 +0000 |
| commit | 2cf2bbe846d234c6dea96b0eb58657a71255b8ac (patch) | |
| tree | a511b8ad983aab2ddbe4fc105935a579c4bf8306 /testing/clapf/ldflags.patch | |
| parent | c8145471c54e481520c0e6d292cef43b4ee9215c (diff) | |
| download | aports-2cf2bbe846d234c6dea96b0eb58657a71255b8ac.tar.bz2 aports-2cf2bbe846d234c6dea96b0eb58657a71255b8ac.tar.xz | |
testing/clapf: upgrade to 0.4.7.4
- fix ldflags which should not be at the end
- fix configure script to use pkgconfig for gsl cflags and libs
- undef a uclibc nameclash - __user
Diffstat (limited to 'testing/clapf/ldflags.patch')
| -rw-r--r-- | testing/clapf/ldflags.patch | 38 |
1 files changed, 38 insertions, 0 deletions
diff --git a/testing/clapf/ldflags.patch b/testing/clapf/ldflags.patch new file mode 100644 index 0000000000..1f5a76d9de --- /dev/null +++ b/testing/clapf/ldflags.patch @@ -0,0 +1,38 @@ +diff --git a/src/Makefile.in b/src/Makefile.in +index 9512aca..6b4388e 100644 +--- a/src/Makefile.in ++++ b/src/Makefile.in +@@ -17,7 +17,7 @@ + CFLAGS = @CFLAGS@ @CPPFLAGS@ + DEFS = @defs@ + INCDIR = -I. -I.. @INCDIR@ @sql_includes@ +-LIBDIR = -L. -L../contrib/spamsum @LIBDIR@ @LDFLAGS@ ++LIBDIR = -L. -L../contrib/spamsum @LIBDIR@ + LIBS = @LIBS@ @sql_libs@ + ##CLAMAV_EXTRA_LIBS = -lclamunrar_iface -lclamunrar + OBJS = @OBJS@ +@@ -40,13 +40,12 @@ install: install-clapf install-includes install-splitmbox @parsembox_install@ @s + + + clapf: clapf.c libclapf.a +- $(CC) $(CFLAGS) $(INCDIR) $(DEFS) -o $@ clapf.c -lclapf $(LIBS) $(LDAP_LIBS) $(LIBDIR) @LDFLAGS@ @libclamav_extra_libs@ ++ $(CC) $(CFLAGS) $(INCDIR) $(DEFS) @LDFLAGS@ -o $@ clapf.c -lclapf $(LIBS) $(LDAP_LIBS) $(LIBDIR) @libclamav_extra_libs@ + + libclapf.a: $(OBJS) $(SQL_OBJS) + ar cr libclapf.a $(OBJS) $(SQL_OBJS) + ranlib libclapf.a +- #$(CC) -shared -Wl,-soname,libclapf.so.$(CLAPF_VERSION) -o libclapf.so.$(LIBCLAPF_VERSION) $(OBJS) $(SQL_OBJS) $(LIBS) $(LDAP_LIBS) @LDFLAGS@ +- $(CC) -shared -Wl -o libclapf.so.$(LIBCLAPF_VERSION) $(OBJS) $(SQL_OBJS) $(LIBS) $(LDAP_LIBS) @LDFLAGS@ ++ $(CC) @LDFLAGS@ -shared -o libclapf.so.$(LIBCLAPF_VERSION) $(OBJS) $(SQL_OBJS) $(LIBS) $(LDAP_LIBS) + ln -sf libclapf.so.$(LIBCLAPF_VERSION) libclapf.so + ln -sf libclapf.so.$(LIBCLAPF_VERSION) libclapf.so.$(CLAPF_VERSION) + +@@ -75,7 +75,7 @@ + $(CC) $(CFLAGS) $(INCDIR) $(DEFS) -o $@ $^ $(LIBS) $(LDAP_LIBS) $(LIBDIR) -ltre + + test: +- $(CC) $(CFLAGS) $(INCDIR) $(DEFS) -o spamtest $(srcdir)/test.c -lclapf $(LIBS) $(LDAP_LIBS) @spamsum_libs@ $(LIBDIR) @LDFLAGS@ ++ $(CC) $(CFLAGS) $(INCDIR) $(DEFS) @LDFLAGS@ -o spamtest $(srcdir)/test.c -lclapf $(LIBS) $(LDAP_LIBS) @spamsum_libs@ $(LIBDIR) + + %.o: $(srcdir)/%.c + $(CC) $(CFLAGS) -fPIC $(INCDIR) $(DEFS) -c $< -o $@ |