Blindly fix seamonkey after the kerberos update by replacing -lkrb5 -lcrypto

by `krb5-config --libs` in toolkit/library/Makefile.in, as it was done
in other mozillas...
This commit is contained in:
landry 2013-06-20 21:20:34 +00:00
parent 2a20e4e3ae
commit daa7cd5d80
2 changed files with 24 additions and 15 deletions

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.135 2013/05/30 14:26:50 landry Exp $
# $OpenBSD: Makefile,v 1.136 2013/06/20 21:20:34 landry Exp $
COMMENT-main = Mozilla application suite
COMMENT-lightning = Mozilla Seamonkey calendar extension
@ -17,7 +17,7 @@ ENIG_V = 1.5.1
PKGNAME-enigmail = enigmail-seamonkey-${ENIG_V}
EPOCH-lightning = 0
EPOCH-enigmail = 0
REVISION-main = 0
REVISION-main = 1
REVISION-lightning = 0
REVISION-enigmail = 3

View File

@ -1,6 +1,6 @@
$OpenBSD: patch-mozilla_toolkit_library_Makefile_in,v 1.16 2013/04/06 14:48:10 landry Exp $
--- mozilla/toolkit/library/Makefile.in.orig Mon Feb 25 03:47:11 2013
+++ mozilla/toolkit/library/Makefile.in Sat Mar 9 20:30:22 2013
$OpenBSD: patch-mozilla_toolkit_library_Makefile_in,v 1.17 2013/06/20 21:20:34 landry Exp $
--- mozilla/toolkit/library/Makefile.in.orig Mon Apr 1 05:31:13 2013
+++ mozilla/toolkit/library/Makefile.in Thu Jun 20 23:16:48 2013
@@ -518,6 +518,12 @@ OS_LIBS += \
$(NULL)
endif
@ -14,16 +14,25 @@ $OpenBSD: patch-mozilla_toolkit_library_Makefile_in,v 1.16 2013/04/06 14:48:10 l
ifeq ($(OS_ARCH),Darwin)
ifdef MOZ_SYDNEYAUDIO
OS_LIBS += \
@@ -530,12 +536,6 @@ OS_LIBS += \
-framework AppKit \
-framework Security \
$(NULL)
-endif
-endif
-
-ifneq (,$(filter NetBSD OpenBSD,$(OS_ARCH)))
-ifdef MOZ_SYDNEYAUDIO
-EXTRA_DSO_LDOPTS += -lossaudio
@@ -533,12 +539,6 @@ OS_LIBS += \
endif
endif
-ifneq (,$(filter NetBSD OpenBSD,$(OS_ARCH)))
-ifdef MOZ_SYDNEYAUDIO
-EXTRA_DSO_LDOPTS += -lossaudio
-endif
-endif
-
ifeq (OpenBSD,$(OS_ARCH))
ifdef MOZ_CUBEB
EXTRA_DSO_LDOPTS += -lsndio
@@ -675,7 +675,7 @@ endif
ifeq ($(OS_ARCH),OpenBSD)
# Needed by nsAuthGSSAPI
-EXTRA_DSO_LDOPTS += -lkrb5 -lcrypto
+EXTRA_DSO_LDOPTS += `krb5-config --libs`
endif
ifdef MOZ_DEBUG