Skip to content

Commit

Permalink
Search for codesign/true, use LDFLAGS for shared libraries (Issue #5411)
Browse files Browse the repository at this point in the history
  • Loading branch information
michaelrsweet committed Oct 16, 2018
1 parent 3451d5e commit bef1d62
Show file tree
Hide file tree
Showing 7 changed files with 181 additions and 156 deletions.
6 changes: 3 additions & 3 deletions cgi-bin/Makefile
Expand Up @@ -192,7 +192,7 @@ uninstall:

libcupscgi.so.1: $(LIBOBJS)
echo Linking $@...
$(DSO) $(ARCHFLAGS) $(DSOFLAGS) -o $@ $(LIBOBJS) $(LIBS)
$(DSO) $(ARCHFLAGS) $(LDFLAGS) $(DSOFLAGS) -o $@ $(LIBOBJS) $(LIBS)
$(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
$(RM) `basename $@ .1`
$(LN) $@ `basename $@ .1`
Expand All @@ -204,7 +204,7 @@ libcupscgi.so.1: $(LIBOBJS)

libcupscgi.1.dylib: $(LIBOBJS) libcupscgi.exp
echo Linking $@...
$(DSO) $(ARCHFLAGS) $(DSOFLAGS) -o $@ \
$(DSO) $(ARCHFLAGS) $(LDFLAGS) $(DSOFLAGS) -o $@ \
-install_name $(libdir)/$@ \
-current_version 1.0.0 \
-compatibility_version 1.0.0 \
Expand All @@ -221,7 +221,7 @@ libcupscgi.1.dylib: $(LIBOBJS) libcupscgi.exp

libcupscgi.la: $(LIBOBJS)
echo Linking $@...
$(LD_CC) $(ARCHFLAGS) $(DSOFLAGS) -o $@ $(LIBOBJS:.o=.lo) -rpath $(LIBDIR) \
$(LD_CC) $(ARCHFLAGS) $(LDFLAGS) $(DSOFLAGS) -o $@ $(LIBOBJS:.o=.lo) -rpath $(LIBDIR) \
-version-info 1:0 $(LIBS)


Expand Down
8 changes: 1 addition & 7 deletions config-scripts/cups-opsys.m4
Expand Up @@ -36,10 +36,4 @@ else
fi
AC_SUBST(LOCALTARGET)

AC_MSG_CHECKING(for codesign utility)
CODE_SIGN="/usr/bin/true"
AC_SUBST(CODE_SIGN)
if test "$host_os_name" = darwin; then
CODE_SIGN="/usr/bin/codesign"
fi
AC_MSG_RESULT(using $CODE_SIGN)
AC_PATH_PROGS(CODE_SIGN, codesign true)

0 comments on commit bef1d62

Please sign in to comment.