mirror of
https://git.FreeBSD.org/ports.git
synced 2024-12-11 02:50:24 +00:00
320b032dff
two gmakes were descending into `engines' directory at the save time:
===> Building for yate-4.3.0.p1
c++ -Wall -I. -I. -O2 -pipe -fPIC [...] -c main.cpp
gmake -C ./engine all
gmake -C ./engine all
gmake[1]: Entering directory `[...]/yate-4.3.0-1/engine'
As a result of this, produced `libyate.so.4.3.0' can be bogus, and will
fail to link against:
c++ -Wall -L/usr/local/lib -o yate -lpthread main.o libyate.so
libyate.so: undefined reference to
`TelEngine::DefaultLogic::DefaultLogic(char const*, int)'
libyate.so: undefined reference to
`TelEngine::ClientLogic::initStaticData()'
gmake: *** [yate] Error 1
To mitigate the problem, avoid dependency on phony `library' target, but
define build command for real libyate.so.4.3.0, and use it as dependency
instead.
- While here, adopt the new LIB_DEPENDS syntax, convert USE_GMAKE
- Drop GNU_CONFIGURE, implied by USE_AUTOTOOLS; sort the knobs a bit
- Do not overwrite few options' descriptions we have from the pool
- Pad the output when displaying pkg-message (by consistent with package)
60 lines
1.9 KiB
Plaintext
60 lines
1.9 KiB
Plaintext
--- ./Makefile.in.orig 2012-05-09 16:33:15.000000000 +0400
|
|
+++ ./Makefile.in 2013-02-14 19:58:02.000000000 +0400
|
|
@@ -20,7 +20,7 @@
|
|
MKDEPS := ./config.status
|
|
PROGS:= yate
|
|
YLIB := libyate.so.@PACKAGE_VERSION@
|
|
-SLIBS:= $(YLIB) libyate.so \
|
|
+SLIBS:= $(YLIB) libyate.so libyate.so.4 \
|
|
libyatescript.so.@PACKAGE_VERSION@ libyatescript.so \
|
|
libyatesig.so.@PACKAGE_VERSION@ libyatesig.so \
|
|
libyatemgcp.so.@PACKAGE_VERSION@ libyatemgcp.so \
|
|
@@ -48,7 +48,7 @@
|
|
libdir = @libdir@
|
|
incdir = @includedir@/yate
|
|
mandir = @mandir@
|
|
-docdir = @datadir@/doc/yate-@PACKAGE_VERSION@
|
|
+docdir = @datadir@/doc/yate
|
|
vardir = @localstatedir@/lib/yate
|
|
moddir = @libdir@/yate
|
|
shrdir = $(datadir)/yate
|
|
@@ -126,7 +126,7 @@
|
|
-rm -f configure yate-config.in
|
|
|
|
.PHONY: engine libs modules clients test apidocs-build apidocs-kdoc apidocs-doxygen apidocs-everything check-topdir check-ldconfig windows
|
|
-engine: library libyate.so $(PROGS)
|
|
+engine: libyate.so $(PROGS)
|
|
|
|
apidocs-kdoc: check-topdir
|
|
@if [ "x$(DOCGEN_K)" != x/bin/false ]; then \
|
|
@@ -217,7 +217,7 @@
|
|
install -m 0644 @srcdir@/docs/man/$$i "$(DESTDIR)$(mandir)/man8/" ; \
|
|
done
|
|
@mkdir -p "$(DESTDIR)$(libdir)/pkgconfig/" && \
|
|
- install -m 0644 yate.pc "$(DESTDIR)$(libdir)/pkgconfig/"
|
|
+ install -m 0644 yate.pc "$(DESTDIR)$(libdir)data/pkgconfig/"
|
|
@mkdir -p "$(DESTDIR)$(incdir)/" && \
|
|
for i in $(INCS) ; do \
|
|
install -m 0644 @srcdir@/$$i "$(DESTDIR)$(incdir)/" ; \
|
|
@@ -245,7 +245,7 @@
|
|
@-for i in $(PROGS) yate-config ; do \
|
|
rm "$(DESTDIR)$(bindir)/$$i" ; \
|
|
done
|
|
- @-rm "$(DESTDIR)$(libdir)/pkgconfig/yate.pc" && \
|
|
+ @-rm "$(DESTDIR)$(libdir)data/pkgconfig/yate.pc" && \
|
|
rmdir $(DESTDIR)$(libdir)/pkgconfig
|
|
@-for i in $(INCS) $(GENS) ; do \
|
|
rm "$(DESTDIR)$(incdir)/$$i" ; \
|
|
@@ -320,9 +320,9 @@
|
|
|
|
libyate.so: $(YLIB)
|
|
ln -sf $^ $@
|
|
+ ln -sf $^ $@\.4
|
|
|
|
-.PHONY: library
|
|
-library $(YLIB): yatepaths.h
|
|
+$(YLIB): yatepaths.h
|
|
$(MAKE) -C ./engine all
|
|
|
|
.PHONY: help
|