зеркало из https://github.com/mozilla/pjs.git
Resolves: bug 366335
Description: Make libldif public - fix Solaris build Fix Description: libldif needs to specify the exports. I added a libldif.ex and fixed libldif/Makefile.in to correctly generate and use the exports listed in the file.
This commit is contained in:
Родитель
6f1336f6fc
Коммит
2df32b3c82
|
@ -0,0 +1,48 @@
|
|||
# ***** BEGIN LICENSE BLOCK *****
|
||||
# Version: MPL 1.1/GPL 2.0/LGPL 2.1
|
||||
#
|
||||
# The contents of this file are subject to the Mozilla Public License Version
|
||||
# 1.1 (the "License"); you may not use this file except in compliance with
|
||||
# the License. You may obtain a copy of the License at
|
||||
# http://www.mozilla.org/MPL/
|
||||
#
|
||||
# Software distributed under the License is distributed on an "AS IS" basis,
|
||||
# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
|
||||
# for the specific language governing rights and limitations under the
|
||||
# License.
|
||||
#
|
||||
# The Original Code is Mozilla Communicator client code.
|
||||
#
|
||||
# The Initial Developer of the Original Code is
|
||||
# Netscape Communications Corporation.
|
||||
# Portions created by the Initial Developer are Copyright (C) 1996-1999
|
||||
# the Initial Developer. All Rights Reserved.
|
||||
#
|
||||
# Contributor(s):
|
||||
#
|
||||
# Alternatively, the contents of this file may be used under the terms of
|
||||
# either of the GNU General Public License Version 2 or later (the "GPL"),
|
||||
# or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
|
||||
# in which case the provisions of the GPL or the LGPL are applicable instead
|
||||
# of those above. If you wish to allow use of your version of this file only
|
||||
# under the terms of either the GPL or the LGPL, and not to allow others to
|
||||
# use your version of this file under the terms of the MPL, indicate your
|
||||
# decision by deleting the provisions above and replace them with the notice
|
||||
# and other provisions required by the GPL or the LGPL. If you do not delete
|
||||
# the provisions above, a recipient may use your version of this file under
|
||||
# the terms of any one of the MPL, the GPL or the LGPL.
|
||||
#
|
||||
# ***** END LICENSE BLOCK *****
|
||||
|
||||
3001 ldif_parse_line
|
||||
3002 ldif_getline
|
||||
3003 ldif_put_type_and_value
|
||||
3004 ldif_put_type_and_value_nowrap
|
||||
3005 ldif_put_type_and_value_with_options
|
||||
3006 ldif_type_and_value
|
||||
3007 ldif_type_and_value_nowrap
|
||||
3008 ldif_type_and_value_with_options
|
||||
3009 ldif_base64_decode
|
||||
3010 ldif_base64_encode
|
||||
3011 ldif_base64_encode_nowrap
|
||||
3012 ldif_get_entry
|
|
@ -75,9 +75,9 @@ THREADSLIB =
|
|||
#
|
||||
ifeq ($(USE_DLL_EXPORTS_FILE), 1)
|
||||
ifeq ($(OS_ARCH), WINNT)
|
||||
GENEXPORTS=cmd /c $(PERL) $(topsrcdir)/ldif/build/genexports.pl
|
||||
GENEXPORTS=cmd /c $(PERL) $(topsrcdir)/ldap/build/genexports.pl
|
||||
else
|
||||
GENEXPORTS=$(PERL) $(topsrcdir)/ldif/build/genexports.pl
|
||||
GENEXPORTS=$(PERL) $(topsrcdir)/ldap/build/genexports.pl
|
||||
endif
|
||||
|
||||
# variable definitions for exported symbols
|
||||
|
@ -100,6 +100,25 @@ endif # USE_DLL_EXPORTS_FILE
|
|||
|
||||
###########################################################################
|
||||
|
||||
ifeq ($(USE_DLL_EXPORTS_FILE), 1)
|
||||
# recursive gmake rule to create exported symbols file
|
||||
$(LDIF_EXPORT_DEFS):: $(srcdir)/../libldif.ex
|
||||
ifeq ($(OS_ARCH), WINNT)
|
||||
$(GENEXPORTS) Win32 $(srcdir)/../msdos/winsock/nsldif32.tdf $< $(GENEXPARGS) > $@
|
||||
else
|
||||
ifeq ($(OS_ARCH), OS2)
|
||||
echo LIBRARY $(LDIF_LIBNAME) INITINSTANCE TERMINSTANCE > $@
|
||||
echo PROTMODE >> $@
|
||||
echo CODE LOADONCALL MOVEABLE DISCARDABLE >> $@
|
||||
echo DATA PRELOAD MOVEABLE MULTIPLE NONSHARED >> $@
|
||||
echo EXPORTS >> $@
|
||||
$(GENEXPORTS) $(OS_ARCH) Standard $< $(GENEXPARGS) >> $@
|
||||
else
|
||||
$(GENEXPORTS) $(OS_ARCH) Standard $< $(GENEXPARGS) > $@
|
||||
endif
|
||||
endif
|
||||
endif # USE_DLL_EXPORTS_FILE
|
||||
|
||||
versiont.c: Makefile.client Version.c
|
||||
@$(RM) $@
|
||||
@(u="$${USER-root}" v="$(shell cat ../../build/version)" d="$(shell pwd)" \
|
||||
|
@ -125,7 +144,7 @@ ifdef SO_FILES_TO_REMOVE
|
|||
-$(RM) $(SO_FILES_TO_REMOVE)
|
||||
endif
|
||||
|
||||
$(LINK_DLL) $(LDAP_EXPORT_FLAGS) $(EXTRA_LIBS)
|
||||
$(LINK_DLL) $(LDIF_EXPORT_FLAGS) $(EXTRA_LIBS)
|
||||
|
||||
|
||||
veryclean:: clean
|
||||
|
|
Загрузка…
Ссылка в новой задаче