macports/macports-base
0
0
Fork 0
mirror of https://github.com/macports/macports-base.git synced 2026-07-12 18:18:43 -07:00
Code Issues Packages Projects Releases Wiki Activity

Breaking out LIBS into separate variables

Browse Source 
In this way, we can avoid linking in unnecessary libraries to our shlibs.

git-svn-id: https://svn.macports.org/repository/macports/trunk/base@27295 d073be05-634f-4543-b044-5fe20cf6d1d6
This commit is contained in:
Chris Pickel
2007-07-27 20:20:41 +00:00
parent 9ca0d734d9
commit 40125137d0
6 changed files with 14 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Mk/macports.autoconf.mk.in
+4 -3
View File
@@ -6,7 +6,7 @@ VPATH = @srcdir@
CC = @CC@
CFLAGS = @CFLAGS@ $(CFLAGS_QUICHEEATERS) $(CFLAGS_WERROR) $(CFLAGS_DEBUG) $(CFLAGS_OPTIMIZE) $(CPPFLAGS) $(CFLAGS_LIBCURL)
OBJCFLAGS = @OBJCFLAGS@ $(CFLAGS_WERROR) ${CFLAGS_DEBUG} $(CFLAGS_OPTIMIZE) $(CPPFLAGS) $(CFLAGS_LIBCURL)
OBJCFLAGS = @OBJCFLAGS@ $(CFLAGS_WERROR) ${CFLAGS_DEBUG} $(CFLAGS_OPTIMIZE) $(CPPFLAGS) $(CFLAGS_LIBCURL)
CPPFLAGS = @CPPFLAGS@ @DEFS@ @INCLUDES@ @TCL_INCLUDES@
TCL_DEFS = @TCL_DEFS@
SHLIB_CFLAGS = @SHLIB_CFLAGS@
@@ -27,15 +27,16 @@ OBJC_FOUNDATION_LIBS = @OBJC_FOUNDATION_LIBS@
TCL_CC = @TCL_CC@
SHLIB_LD = @SHLIB_LD@
LDFLAGS_LIBCURL = @LDFLAGS_LIBCURL@
LDFLAGS = -L/usr/local/lib @LDFLAGS@ $(LDFLAGS_LIBCURL)
LDFLAGS = -L/usr/local/lib @LDFLAGS@
SHLIB_LDFLAGS = @SHLIB_LDFLAGS@ ${LDFLAGS}
SHLIB_SUFFIX = @SHLIB_SUFFIX@
TCL_STUB_LIB_SPEC = @TCL_STUB_LIB_SPEC@
LIBS = @LIBS@
READLINE_LIBS = @READLINE_LIBS@
MD5_LIBS = @MD5_LIBS@
SQLITE3_LIBS = @SQLITE3_LIBS@
CURL_LIBS = @LDFLAGS_LIBCURL@
INSTALL = @INSTALL@
MTREE = @MTREE@
LN_S = @LN_S@
Mk/macports.tea.mk
+1 -1
View File
@@ -7,7 +7,7 @@
${CC} -c -DUSE_TCL_STUBS ${CFLAGS} ${TCL_DEFS} ${SHLIB_CFLAGS} $< -o $@
$(SHLIB_NAME):: ${OBJS}
${SHLIB_LD} ${OBJS} -o ${SHLIB_NAME} ${TCL_STUB_LIB_SPEC} ${SHLIB_LDFLAGS} ${LIBS} ${MD5_LIBS} ${SQLITE3_LIBS}
${SHLIB_LD} ${OBJS} -o ${SHLIB_NAME} ${TCL_STUB_LIB_SPEC} ${SHLIB_LDFLAGS} ${LIBS}
all:: ${SHLIB_NAME}
configure
Vendored
+5 -8
View File
@@ -729,6 +729,7 @@ X_CFLAGS
X_PRE_LIBS
X_LIBS
X_EXTRA_LIBS
READLINE_LIBS
TCL_VERSION
TCL_BIN_DIR
TCL_SRC_DIR
@@ -10326,7 +10327,6 @@ echo "$as_me: error: Broken X11 install" >&2;}
# Check for readline
{ echo "$as_me:$LINENO: checking for readline in -lreadline" >&5
echo $ECHO_N "checking for readline in -lreadline... $ECHO_C" >&6; }
if test "${ac_cv_lib_readline_readline+set}" = set; then
@@ -10389,12 +10389,7 @@ fi
{ echo "$as_me:$LINENO: result: $ac_cv_lib_readline_readline" >&5
echo "${ECHO_T}$ac_cv_lib_readline_readline" >&6; }
if test $ac_cv_lib_readline_readline = yes; then
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBREADLINE 1
_ACEOF
LIBS="-lreadline $LIBS"
READLINE_LIBS=-lreadline
fi
{ echo "$as_me:$LINENO: checking whether rl_username_completion_function is declared" >&5
@@ -10832,6 +10827,7 @@ fi
# Lowest non-system-reserved uid and gid (Apple claims <500)
cat >>confdefs.h <<\_ACEOF
@@ -12474,6 +12470,7 @@ X_CFLAGS!$X_CFLAGS$ac_delim
X_PRE_LIBS!$X_PRE_LIBS$ac_delim
X_LIBS!$X_LIBS$ac_delim
X_EXTRA_LIBS!$X_EXTRA_LIBS$ac_delim
READLINE_LIBS!$READLINE_LIBS$ac_delim
TCL_VERSION!$TCL_VERSION$ac_delim
TCL_BIN_DIR!$TCL_BIN_DIR$ac_delim
TCL_SRC_DIR!$TCL_SRC_DIR$ac_delim
@@ -12510,7 +12507,7 @@ LIBOBJS!$LIBOBJS$ac_delim
LTLIBOBJS!$LTLIBOBJS$ac_delim
_ACEOF
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 50; then
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 51; then
break
elif $ac_last_try; then
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
configure.ac
+2 -1
View File
@@ -95,7 +95,7 @@ MP_LIB_MD5
MP_CHECK_X11
# Check for readline
AC_CHECK_LIB([readline], [readline])
AC_CHECK_LIB([readline], [readline], [READLINE_LIBS=-lreadline])
AC_CHECK_DECLS([rl_username_completion_function,rl_filename_completion_function,rl_completion_matches,username_completion_function,filename_completion_function,completion_matches], [], [],
[
#include <stdio.h>
@@ -103,6 +103,7 @@ AC_CHECK_DECLS([rl_username_completion_function,rl_filename_completion_function,
# include <readline/readline.h>
#endif
])
AC_SUBST(READLINE_LIBS)
# Lowest non-system-reserved uid and gid (Apple claims <500)
AC_DEFINE([MIN_USABLE_UID], [500], [Lowest non-system-reserved UID.])
src/config.h.in
-3
View File
@@ -102,9 +102,6 @@
/* Define if you have the `md' library (-lmd). */
#undef HAVE_LIBMD
/* Define to 1 if you have the `readline' library (-lreadline). */
#undef HAVE_LIBREADLINE
/* Define to 1 if you have the <limits.h> header file. */
#undef HAVE_LIMITS_H
src/pextlib1.0/Makefile
+2
View File
@@ -9,6 +9,8 @@ export MACOSX_DEPLOYMENT_TARGET=10.3
include ../../Mk/macports.autoconf.mk
include ../../Mk/macports.tea.mk
LIBS+= ${CURL_LIBS} ${MD5_LIBS}
.PHONY: test
test:: ${SHLIB_NAME}