228ab58873
Remove patches and hacks that were used to work around the previous situation This allows to stage more ports as a regular user Differential Revision: https://reviews.freebsd.org/D703 Reviewed by and discussed with: bapt With hat: portmgr
37 lines
1.5 KiB
Text
37 lines
1.5 KiB
Text
--- generic/Makefile.in.orig 2010-12-10 23:39:42 UTC
|
|
+++ generic/Makefile.in
|
|
@@ -161,6 +161,8 @@
|
|
libvers_a = libBLT$(version).a
|
|
tcl_only_lib_a = libBLTlite.a
|
|
tcl_only_libvers_a = libBLTlite$(version).a
|
|
+stub_a = libBLTstub.a
|
|
+stub_libvers_a = libBLTstub$(version).a
|
|
|
|
CC_SWITCHES = $(EXTRA_CFLAGS) $(CFLAGS) $(DEFINES) $(INCLUDES)
|
|
INSTALL = @INSTALL@
|
|
@@ -215,13 +217,15 @@
|
|
$(INSTALL) -m 0755 $(bltwish) $(INSTALL_ROOT)$(bindir)
|
|
$(INSTALL) -m 0755 $(bltsh) $(INSTALL_ROOT)$(bindir)
|
|
|
|
-install-lib: $(lib_a) $(tcl_only_lib_a)
|
|
+install-lib: $(lib_a) $(tcl_only_lib_a) $(stub_a)
|
|
$(INSTALL_DATA) $(lib_a) $(INSTALL_ROOT)$(libdir)/$(libvers_a)
|
|
(cd $(INSTALL_ROOT)$(libdir); $(RM) $(lib_a) ; $(LN_S) $(libvers_a) $(lib_a))
|
|
$(RANLIB) $(INSTALL_ROOT)$(libdir)/$(libvers_a)
|
|
$(INSTALL_DATA) $(tcl_only_lib_a) $(INSTALL_ROOT)$(libdir)/$(tcl_only_libvers_a)
|
|
(cd $(INSTALL_ROOT)$(libdir); $(RM) $(tcl_only_lib_a) ; $(LN_S) $(tcl_only_libvers_a) $(tcl_only_lib_a))
|
|
$(RANLIB) $(INSTALL_ROOT)$(libdir)/$(tcl_only_libvers_a)
|
|
+ $(INSTALL_DATA) $(stub_a) $(INSTALL_ROOT)$(libdir)/$(stub_libvers_a)
|
|
+ (cd $(INSTALL_ROOT)$(libdir); $(RM) $(stub_a) ; $(LN_S) $(stub_libvers_a) $(stub_a))
|
|
(cd shared; $(MAKE) install)
|
|
|
|
mkdirs:
|
|
@@ -244,7 +248,7 @@
|
|
$(LINT) $(LINTFLAGS) $(DEFINES) $(INCLUDES) $(SRCS)
|
|
|
|
libBLTstub.a:
|
|
- $(CC) -I$(srcdir) @INCLUDES@ -c $(srcdir)/bltStubLib.c
|
|
+ $(CC) -fPIC -I$(srcdir) @INCLUDES@ -c $(srcdir)/bltStubLib.c
|
|
$(AR) libBLTstub.a bltStubLib.o
|
|
$(RANLIB) libBLTstub.a
|
|
|