Skip to content

C
core
Kaydet (Commit) aa8f1fb3 authored tarafından Mathias Bauer's avatar Mathias Bauer
Dosyalara gözat
Seçenekler

merge commit

üst d7c414d2 25f1c59e
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 189 additions and 239 deletions
afms/makefile.mk
Dosyayı görüntüle @ aa8f1fb3
......@@ -37,7 +37,7 @@ TARGET=afms
# --- Settings -----------------------------------------------------
.INCLUDE : settings.mk
.IF "$(L10N_framework)"==""
# --- Files --------------------------------------------------------
TARFILE_NAME=Adobe-Core35_AFMs-314
......@@ -53,9 +53,11 @@ ZIP1DIR = $(MISC)$/build$/$(TARFILE_NAME)
ZIP1TARGET = fontunxafm
ZIP1LIST = *.afm -x "*Helvetica-Narrow*"
.ENDIF # L10N_framework
.INCLUDE : target.mk
.INCLUDE : tg_ext.mk
.IF "$(L10N_framework)"==""
$(ZIP1TARGETN): $(PACKAGE_DIR)$/$(UNTAR_FLAG_FILE)
.ENDIF # L10N_framework
agg/source/makefile.mk
Dosyayı görüntüle @ aa8f1fb3
......@@ -37,7 +37,7 @@ ENABLE_EXCEPTIONS=TRUE
# --- Settings ----------------------------------
.INCLUDE : settings.mk
.IF "$(L10N_framework)"==""
# don't link default libraries from sal
UWINAPILIB=
LIBSALCPPRT=
......@@ -86,7 +86,10 @@ DEFLIB1NAME =$(TARGET)
# --- Targets ----------------------------------
.ENDIF # L10N_framework
.INCLUDE : target.mk
.IF "$(L10N_framework)"==""
$(MISC)$/$(SHL1TARGET).flt : makefile.mk $(TARGET).flt
@$(TYPE) $(TARGET).flt > $@
.ENDIF # L10N_framework
apple_remote/makefile.mk
Dosyayı görüntüle @ aa8f1fb3
......@@ -39,7 +39,6 @@ ENABLE_EXCEPTIONS=TRUE
# --- Settings -----------------------------------------------------
.INCLUDE : settings.mk
.INCLUDE : $(PRJ)$/makefile2.pmk
# --- Files --------------------------------------------------------
......
apple_remote/makefile2.pmk deleted 100644 → 0
Dosyayı görüntüle @ d7c414d2
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# Copyright 2008 by Sun Microsystems, Inc.
#
# OpenOffice.org - a multi-platform office productivity suite
#
# $RCSfile: makefile2.pmk,v $
#
# $Revision: 1.1 $
#
# This file is part of OpenOffice.org.
#
# OpenOffice.org is free software: you can redistribute it and/or modify
# it under the terms of the GNU Lesser General Public License version 3
# only, as published by the Free Software Foundation.
#
# OpenOffice.org is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU Lesser General Public License version 3 for more details
# (a copy is included in the LICENSE file that accompanied this code).
#
# You should have received a copy of the GNU Lesser General Public License
# version 3 along with OpenOffice.org. If not, see
# <http://www.openoffice.org/license.html>
# for a copy of the LGPLv3 License.
#
#*************************************************************************
.IF "$(GUIBASE)"=="aqua"
OBJCXXFLAGS=-x objective-c++ -fobjc-exceptions
CFLAGSCXX+=$(OBJCXXFLAGS)
.ENDIF # "$(GUIBASE)"=="aqua"
external/mingwheaders/makefile.mk
Dosyayı görüntüle @ aa8f1fb3
......@@ -56,116 +56,105 @@ ATL_INCLUDE_DIR=$(PSDK_HOME)$/include$/atl$/
DIRECTXSDK_INCLUDE_DIR=$(DIRECTXSDK_HOME)$/include$/
FILES_TO_COPY_FROM_MINGW=excpt.h \
tchar.h
FILES_TO_COPY_FROM_W32API=amvideo.h \
bdatypes.h \
imm.h \
oaidl.h \
objfwd.h \
objidl.h \
uxtheme.h \
winbase.h \
wininet.h \
winnt.h \
winver.h \
wtypes.h
FILES_TO_COPY_FROM_SYS=stat.h
FILES_TO_COPY_FROM_PSDK=adoctint.h \
adodef.h \
adoguids.h \
adoint.h \
bcrypt.h \
commctrl.h \
control.h \
filter.h \
gdiplusbitmap.h \
gdiplusbrush.h \
gdiplusenums.h \
gdiplusfont.h \
gdiplusheaders.h \
gdiplusimageattributes.h \
gdiplusimaging.h \
gdiplusmatrix.h \
gdipluspath.h \
gdipluspen.h \
gdiplusregion.h \
gdiplusstringformat.h \
imagehlp.h \
inaddr.h \
intsafe.h \
mapinls.h \
mapiwin.h \
msdasc.h \
msi.h \
msiquery.h \
multimon.h \
ncrypt.h \
ntquery.h \
ocidl.h \
oledb.h \
oleidl.h \
propidl.h \
propkeydef.h \
propsys.h \
qedit.h \
shlobj.h \
shobjidl.h \
shtypes.h \
specstrings.h \
specstrings_adt.h \
specstrings_strict.h \
sspi.h \
strmif.h \
strsafe.h \
structuredquery.h \
urlmon.h \
wincrypt.h \
wingdi.h \
winsock2.h \
winuser.h \
ws2def.h \
ws2ipdef.h \
ws2tcpip.h \
wspiapi.h \
adoid.h \
amstream.h \
austream.h \
ddstream.h \
dispex.h \
dshow.h \
exdispid.h \
gdiplus.h \
mmstream.h \
msxml.h \
oleauto.h \
olectl.h \
qos.h \
shlguid.h \
transact.h \
winerror.h
FILES_TO_COPY_FROM_MINGW= \
excpt.h \
tchar.h
FILES_TO_COPY_FROM_W32API= \
amvideo.h \
basetyps.h \
oaidl.h \
objidl.h \
specstrings.h \
uxtheme.h \
winbase.h \
windef.h \
wininet.h \
winver.h \
wtypes.h
FILES_TO_COPY_FROM_SYS= \
stat.h
FILES_TO_COPY_FROM_PSDK= \
adoctint.h \
adodef.h \
adoguids.h \
adoint.h \
bcrypt.h \
commctrl.h \
control.h \
dispex.h \
filter.h \
gdiplusbitmap.h \
gdiplusbrush.h \
gdiplusenums.h \
gdiplusfont.h \
gdiplusheaders.h \
gdiplusimageattributes.h \
gdiplusimaging.h \
gdiplusmatrix.h \
gdipluspath.h \
gdipluspen.h \
gdiplusregion.h \
gdiplusstringformat.h \
imm.h \
imagehlp.h \
mapiwin.h \
msdasc.h \
msi.h \
msiquery.h \
multimon.h \
ntquery.h \
ocidl.h \
oleauto.h \
olectl.h \
oledb.h \
oleidl.h \
propidl.h \
propkeydef.h \
propsys.h \
shlobj.h \
shobjidl.h \
shtypes.h \
sspi.h \
strmif.h \
strsafe.h \
structuredquery.h \
urlmon.h \
wincrypt.h \
winerror.h \
wingdi.h \
wintrust.h \
winuser.h \
wspiapi.h \
exdispid.h \
dshow.h \
gdiplus.h \
msxml.h \
ncrypt.h \
shlguid.h \
transact.h
.IF "$(DISABLE_ATL)"==""
MINGWHEADER_ATL_PATCH_TARGET=$(MISC)$/mingwheader_atl_patch
MINGWHEADER_ATL_COPY_TARGET=$(MISC)$/mingwheader_atl_copy
FILES_TO_COPY_FROM_ATL=atlbase.h \
atlcom.h \
atlconv.h \
atlctl.h \
atlwin.h \
statreg.h
FILES_TO_COPY_FROM_ATL= \
atlbase.h \
atlcom.h \
atlconv.h \
atlctl.h \
atlwin.h \
statreg.h
.ENDIF
FILES_TO_COPY_FROM_DIRECTXSDK=dxtrans.h \
d3dx9.h \
d3d.h \
d3dtypes.h \
d3dx9math.h \
d3dx9math.inl \
d3dx9core.h
FILES_TO_COPY_FROM_DIRECTXSDK= \
d3dtypes.h \
d3dx9core.h \
d3dx9math.h \
d3dx9math.inl \
dxtrans.h \
d3dx9.h
$(MISC)$/mingwheader_patch_all : $(MISC)$/mingwheader_patch $(MINGWHEADER_ATL_PATCH_TARGET) $(LB)$/libmsvcrt.a
......@@ -198,16 +187,20 @@ $(MINGWHEADER_ATL_COPY_TARGET):
$(LB)$/libmsvcrt.a:
.IF "$(USE_MINGW)" == "cygwin"
$(WRAPCMD) nm -g --defined-only $(COMPATH)$/lib/mingw/libmsvcrt.a > $(MISC)$/msvcrt.nm
$(COPY) $(COMPATH)$/lib/mingw/libmsvcrt.a $(LB)$/libmsvcrt_orig.a
.ELSE
$(WRAPCMD) nm -g --defined-only $(COMPATH)$/lib/libmsvcrt.a > $(MISC)$/msvcrt.nm
$(COPY) $(COMPATH)$/lib/libmsvcrt.a $(LB)$/libmsvcrt_orig.a
.ENDIF
cd $(LB) && ar -x libmsvcrt_orig.a ofmt_stub.o
ar -d $(LB)$/libmsvcrt_orig.a ofmt_stub.o
nm -g --defined-only $(LB)$/libmsvcrt_orig.a > $(MISC)$/msvcrt.nm
echo EXPORTS > $(MISC)$/msvcrt.def
sed -ne 's/.* T _//p' $(MISC)$/msvcrt.nm | sort >> $(MISC)$/msvcrt.def
-sed -ne 's/.* I __imp__//p' $(MISC)$/msvcrt.nm | sort | diff - $(MISC)$/msvcrt.def | \
sed -ne 's/^< \(.*\)$/\1 DATA/p' > $(MISC)$/msvcrtdata.def
cat $(MISC)$/msvcrtdata.def >> $(MISC)$/msvcrt.def
dlltool --dllname msvcrt.dll --input-def=$(MISC)$/msvcrt.def --kill-at --output-lib=$(LB)$/libmsvcrt.a
cd $(LB) && ar -rs libmsvcrt.a ofmt_stub.o
clean:
-$(RM) $(MISC)$/mingw$/include$/*.h
......
hsqldb/makefile.mk
Dosyayı görüntüle @ aa8f1fb3
......@@ -53,7 +53,8 @@ TARFILE_NAME=hsqldb_$(HSQLDB_VERSION)
TARFILE_ROOTDIR=hsqldb
CONVERTFILES=build$/build.xml \
src$/org$/hsqldb$/persist$/HsqlDatabaseProperties.java
src$/org$/hsqldb$/persist$/HsqlDatabaseProperties.java \
src$/org$/hsqldb$/Library.java
PATCH_FILES=patches$/accumulated_patches.patch
......
hsqldb/patches/accumulated_patches.patch
Dosyayı görüntüle @ aa8f1fb3
......@@ -102,3 +102,14 @@
}
// OOo end
--- misc/hsqldb/src/org/hsqldb/Library.java
+++ misc/build/hsqldb/src/org/hsqldb/Library.java
@@ -1957,7 +1957,7 @@
functionMap.put("bitand", bitand);
functionMap.put("bitlength", bitLength);
functionMap.put("bitor", bitor);
- functionMap.put("bitxor", bitor);
+ functionMap.put("bitxor", bitxor);
functionMap.put("character", character);
functionMap.put("concat", concat);
functionMap.put("cot", cot);
hyphen/makefile.mk
Dosyayı görüntüle @ aa8f1fb3
......@@ -63,7 +63,9 @@ LCL_CONFIGURE_CFLAGS+=-m64
LCL_CONFIGURE_CFLAGS+=$(EXTRA_CFLAGS)
CONFIGURE_FLAGS+=CXXFLAGS="$(EXTRA_CFLAGS)"
.ENDIF # "$(EXTRA_CFLAGS)"!=""
.ENDIF # "$(SYSBASE)"!=""
.ELIF "$(OS)"=="MACOSX" # "$(SYSBASE)"!=""
CONFIGURE_FLAGS+=CPPFLAGS="$(EXTRA_CDEFS)"
.ENDIF
.IF "$(LCL_CONFIGURE_CFLAGS)"!=""
CONFIGURE_FLAGS+=CFLAGS='$(LCL_CONFIGURE_CFLAGS)'
......
libegg/source/makefile.mk
Dosyayı görüntüle @ aa8f1fb3
......@@ -41,7 +41,7 @@ C_RESTRICTIONFLAGS*=-xc99=no_lib
# --- Settings ----------------------------------
.INCLUDE : settings.mk
.IF "$(L10N_framework)"==""
.IF "$(ENABLE_GTK)"!=""
PKGCONFIG_MODULES=gtk+-2.0 gdk-2.0
......@@ -53,7 +53,7 @@ CFLAGS+=$(PKGCONFIG_CFLAGS)
SLOFILES=\
$(SLO)$/eggtrayicon.obj
SHL1STDLIBS+=$(PKGCONFIG_LIBS)
SHL1STDLIBS+=$(PKGCONFIG_LIBS) $(X11LINK_DYNAMIC)
.IF "$(PKGCONFIG_ROOT)"!=""
SHL1SONAME+=-z nodefs
SHL1NOCHECK=TRUE
......@@ -66,5 +66,5 @@ SHL1LIBS= $(SLB)$/eggtray.lib
.ENDIF # "$(ENABLE_GTK)"!=""
# --- Targets ----------------------------------
.ENDIF # L10N_framework
.INCLUDE : target.mk
libtextcat/makefile.mk
Dosyayı görüntüle @ aa8f1fb3
......@@ -58,7 +58,7 @@ ADDITIONAL_FILES= \
#relative to CONFIGURE_DIR
CONFIGURE_ACTION=configure CFLAGS="$(ARCH_FLAGS) $(EXTRA_CFLAGS)"
CONFIGURE_FLAGS=
CONFIGURE_FLAGS=$(eq,$(OS),MACOSX CPPFLAGS="$(EXTRA_CDEFS)" $(NULL))
BUILD_ACTION=make
......
libxmlsec/makefile.mk
Dosyayı görüntüle @ aa8f1fb3
......@@ -49,7 +49,8 @@ EXTERNAL_WARNINGS_NOT_ERRORS := TRUE
XMLSEC1VERSION=1.2.6
TARFILE_NAME=$(PRJNAME)-$(XMLSEC1VERSION)
PATCH_FILES=$(TARFILE_NAME).patch
PATCH_FILES=$(TARFILE_NAME).patch xmlsec1-1.2.6-mingwport24.patch
ADDITIONAL_FILES= \
include$/xmlsec$/nss$/akmngr.h \
......@@ -87,7 +88,7 @@ xmlsec_LIBS+=-lstdc++_s
.ENDIF
CONFIGURE_DIR=
CONFIGURE_ACTION=chmod 777 libxml2-config && .$/configure
CONFIGURE_FLAGS=--with-libxslt=no --with-openssl=no --with-gnutls=no --with-mozilla_ver=1.7.5 --with-mscrypto --build=i586-pc-mingw32 --host=i586-pc-mingw32 CC="$(xmlsec_CC)" CFLAGS="-D_MT" LDFLAGS="-no-undefined -L$(ILIB:s/;/ -L/)" LIBS="$(xmlsec_LIBS)" LIBXML2LIB=$(LIBXML2LIB) ZLIB3RDLIB=$(ZLIB3RDLIB) OBJDUMP="$(WRAPCMD) objdump"
CONFIGURE_FLAGS=--with-libxslt=no --with-openssl=no --with-gnutls=no --with-mozilla_ver=1.7.5 --with-mscrypto --build=i586-pc-mingw32 --host=i586-pc-mingw32 CC="$(xmlsec_CC)" CFLAGS="-D_MT" LDFLAGS="-no-undefined -L$(ILIB:s/;/ -L/)" LIBS="$(xmlsec_LIBS)" LIBXML2LIB=$(LIBXML2LIB) OBJDUMP="$(WRAPCMD) objdump"
.IF "$(SYSTEM_MOZILLA)" != "YES"
CONFIGURE_FLAGS+=--enable-pkgconfig=no
.ENDIF
......@@ -120,7 +121,9 @@ xmlsec_CFLAGS+=$(C_RESTRICTIONFLAGS)
xmlsec_CFLAGS+=$(EXTRA_CFLAGS)
.ENDIF # "$(EXTRA_CFLAGS)"!=""
xmlsec_LDFLAGS+=-L$(SYSBASE)$/usr$/lib
.ENDIF # "$(SYSBASE)"!=""
.ELIF "$(OS)"=="MACOSX" # "$(SYSBASE)"!=""
xmlsec_CPPFLAGS+=$(EXTRA_CDEFS)
.ENDIF
.IF "$(OS)$(COM)"=="LINUXGCC" || "$(OS)$(COM)"=="FREEBSDGCC"
xmlsec_LDFLAGS+=-Wl,-rpath,'$$$$ORIGIN:$$$$ORIGIN/../ure-link/lib'
......@@ -139,7 +142,7 @@ LDFLAGS:=$(xmlsec_LDFLAGS)
.ENDIF
CONFIGURE_DIR=
CONFIGURE_ACTION=chmod 777 libxml2-config && .$/configure ADDCFLAGS="$(xmlsec_CFLAGS)" CPPFLAGS="$(xmlsec_CPPFLAGS)"
CONFIGURE_FLAGS=--with-pic --disable-shared --with-libxslt=no --with-openssl=no --with-gnutls=no LIBXML2LIB="$(LIBXML2LIB)" ZLIB3RDLIB=$(ZLIB3RDLIB)
CONFIGURE_FLAGS=--with-pic --disable-shared --with-libxslt=no --with-openssl=no --with-gnutls=no LIBXML2LIB="$(LIBXML2LIB)"
# system-mozilla needs pkgconfig to get the information about nss
# FIXME: This also will enable pkg-config usage for libxml2. It *seems*
# that the internal headers still are used when they are there but....
......
libxmlsec/xmlsec1-1.2.6-mingwport24.patch 0 → 100644
Dosyayı görüntüle @ aa8f1fb3
--- misc/xmlsec1-1.2.6/configure 2009-09-18 17:19:00.000000000 +0200
+++ misc/build/xmlsec1-1.2.6/configure 2009-09-18 17:18:43.000000000 +0200
@@ -21749,6 +21749,10 @@
ac_compiler_gnu=$ac_cv_c_compiler_gnu
+case $host_os in
+mingw*)
+;;
+*)
echo "$as_me:$LINENO: checking for shl_load" >&5
echo $ECHO_N "checking for shl_load... $ECHO_C" >&6
if test "${ac_cv_func_shl_load+set}" = set; then
@@ -22299,7 +22303,8 @@
fi
-
+;;
+esac
if test x"$libltdl_cv_func_dlopen" = xyes || test x"$libltdl_cv_lib_dl_dlopen" = xyes
then
libxmlsec/xmlsec1-1.2.6.patch
Dosyayı görüntüle @ aa8f1fb3
......@@ -213,15 +213,6 @@
version_type=freebsd-$objformat
case $version_type in
freebsd-elf*)
@@ -24598,7 +24599,7 @@
fi
LIBXML_MIN_VERSION="2.4.2"
-LIBXML_CONFIG="xml2-config"
+LIBXML_CONFIG="./libxml2-config"
LIBXML_CFLAGS=""
LIBXML_LIBS=""
LIBXML_FOUND="no"
@@ -25678,12 +25679,26 @@
XMLSEC_NO_NSS="1"
......@@ -2388,15 +2379,6 @@
s,@XMLSEC_NO_SHA1@,$XMLSEC_NO_SHA1,;t t
--- misc/xmlsec1-1.2.6/configure.in 2004-08-26 04:49:24.000000000 +0200
+++ misc/build/xmlsec1-1.2.6/configure.in 2008-06-29 23:44:19.000000000 +0200
@@ -143,7 +143,7 @@
dnl find libxml
dnl ==========================================================================
LIBXML_MIN_VERSION="2.4.2"
-LIBXML_CONFIG="xml2-config"
+LIBXML_CONFIG="./libxml2-config"
LIBXML_CFLAGS=""
LIBXML_LIBS=""
LIBXML_FOUND="no"
@@ -503,12 +503,26 @@
XMLSEC_NO_NSS="1"
......@@ -3076,58 +3058,6 @@
+
+#endif /* __XMLSEC_NSS_TOKENS_H__ */
+
--- misc/xmlsec1-1.2.6/libxml2-config 2008-06-29 23:44:40.000000000 +0200
+++ misc/build/xmlsec1-1.2.6/libxml2-config 2008-06-29 23:44:19.000000000 +0200
@@ -1 +1,48 @@
-dummy
+#! /bin/sh
+
+if test "$SYSTEM_LIBXML" = "YES"
+then xml2-config "$@"; exit 0
+fi
+
+prefix=${SOLARVERSION}/${INPATH}
+includedir=${SOLARVERSION}/${INPATH}/inc${UPDMINOREXT}/external
+libdir=${SOLARVERSION}/${INPATH}/lib${UPDMINOREXT}
+
+while test $# -gt 0; do
+ case "$1" in
+ -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
+ *) optarg= ;;
+ esac
+
+ case "$1" in
+ --prefix=*)
+ prefix=$optarg
+ includedir=$prefix/include
+ libdir=$prefix/lib
+ ;;
+
+ --prefix)
+ echo $prefix
+ ;;
+
+ --version)
+ echo 2.5.4
+ exit 0
+ ;;
+
+ --cflags)
+ echo -I${includedir}
+ ;;
+
+ --libs)
+ echo -L${libdir} ${LIBXML2LIB} ${ZLIB3RDLIB} -lm
+ ;;
+
+ *)
+ exit 1
+ ;;
+ esac
+ shift
+done
+
+exit 0
--- misc/xmlsec1-1.2.6/ltmain.sh 2004-08-26 08:00:15.000000000 +0200
+++ misc/build/xmlsec1-1.2.6/ltmain.sh 2008-06-29 23:44:19.000000000 +0200
@@ -1661,6 +1661,11 @@
......
lpsolve/makefile.mk
Dosyayı görüntüle @ aa8f1fb3
......@@ -73,6 +73,7 @@ BUILD_ACTION=sh ccc.os2
OUT2LIB=$(BUILD_DIR)$/liblpsolve55.lib
.ELSE
.IF "$(OS)"=="MACOSX"
.EXPORT: EXTRA_CDEFS EXTRA_LINKFLAGS
BUILD_ACTION=sh ccc.osx
OUT2LIB=$(BUILD_DIR)$/liblpsolve55.dylib
.ELSE
......
np_sdk/mozsrc/makefile.mk
Dosyayı görüntüle @ aa8f1fb3
......@@ -39,11 +39,12 @@ EXTERNAL_WARNINGS_NOT_ERRORS := TRUE
# --- Settings -----------------------------------------------------
.INCLUDE : settings.mk
.IF "$(L10N_framework)"==""
JDKINCS=
# --- Files --------------------------------------------------------
.IF "$(GUI)" == "WNT"
.IF "$(GUI)" == "WNT" || "$(GUI)" == "OS2"
MOZFILES = $(SLO)$/npwin.obj
.ELSE
MOZFILES = $(SLO)$/npunix.obj
......@@ -56,6 +57,7 @@ CDEFS+=-DNO_X11
ALL: $(MOZFILES)
# --- Targets ------------------------------------------------------
.ENDIF # L10N_framework
.INCLUDE : target.mk
np_sdk/mozsrc/npwin.cpp
Dosyayı görüntüle @ aa8f1fb3
......@@ -45,6 +45,12 @@
//\\// DEFINE
#define NP_EXPORT
#ifdef OS2
#define WINAPI _System
#define HIBYTE(a) (a>>8)
#define LOBYTE(a) (a&0xFF)
#endif
//\\// GLOBAL DATA
NPNetscapeFuncs* g_pNavigatorFuncs = 0;
......
openssl/makefile.mk
Dosyayı görüntüle @ aa8f1fb3
......@@ -65,7 +65,7 @@ OUT2LIB = libssl.*
OUT2LIB += libcrypto.*
OUT2INC += include/openssl/*
.IF "$(OS)" == "LINUX"
.IF "$(OS)" == "LINUX" || "$(OS)" == "FREEBSD"
PATCH_FILES=openssllnx.patch
ADDITIONAL_FILES:= \
libcrypto_OOo_0_9_8k.map \
......
openssl/openssl.patch
Dosyayı görüntüle @ aa8f1fb3
......@@ -50,7 +50,19 @@
$mkdir="-mkdir" unless defined $mkdir;
($ssl,$crypto)=("ssl","crypto");
@@ -570,7 +570,7 @@
@@ -277,6 +277,11 @@
chop;
($key,$val)=/^([^=]+)=(.*)/;
+
+ # On some Windows machines, $val has linefeeds at the end, which confuses
+ # subsequent code in this file. So we strip all whitespace at the end.
+ $val =~ s/\s+$//;
+
if ($key eq "RELATIVE_DIRECTORY")
{
if ($lib ne "")
@@ -570,7 +575,7 @@
printf OUT <<EOF;
#ifdef $platform_cpp_symbol
/* auto-generated/updated by util/mk1mf.pl for crypto/cversion.c */
......
redland/prj/build.lst
Dosyayı görüntüle @ aa8f1fb3
rld redland : soltools ZLIB:zlib LIBXML2:libxml2 LIBXSLT:libxslt OPENSSL:openssl NULL
rld redland : soltools LIBXML2:libxml2 LIBXSLT:libxslt OPENSSL:openssl NULL
rld redland usr1 - all rld_mkout NULL
rld redland\raptor nmake - all rld_raptor NULL
rld redland\rasqal nmake - all rld_rasqal rld_raptor NULL
......
redland/raptor/makefile.mk
Dosyayı görüntüle @ aa8f1fb3
......@@ -83,7 +83,7 @@ raptor_LIBS+=-lstdc++_s
CONFIGURE_DIR=
CONFIGURE_ACTION=.$/configure
# do not enable grddl parser (#i93768#)
CONFIGURE_FLAGS=--disable-static --disable-gtk-doc --with-openssl-digests --with-xml-parser=libxml --enable-parsers="rdfxml ntriples turtle trig guess rss-tag-soup" --without-bdb --without-sqlite --without-mysql --without-postgresql --without-threestore --with-regex-library=posix --with-decimal=none --with-www=xml --build=i586-pc-mingw32 --host=i586-pc-mingw32 lt_cv_cc_dll_switch="-shared" CC="$(raptor_CC)" CFLAGS=-D_MT CPPFLAGS="-nostdinc $(INCLUDE)" LDFLAGS="-no-undefined -Wl,--enable-runtime-pseudo-reloc,--export-all-symbols -L$(ILIB:s/;/ -L/)" LIBS="$(raptor_LIBS)" OBJDUMP="$(WRAPCMD) objdump" LIBXML2LIB=$(LIBXML2LIB) ZLIB3RDLIB=$(ZLIB3RDLIB) XSLTLIB="$(XSLTLIB)"
CONFIGURE_FLAGS=--disable-static --disable-gtk-doc --with-openssl-digests --with-xml-parser=libxml --enable-parsers="rdfxml ntriples turtle trig guess rss-tag-soup" --without-bdb --without-sqlite --without-mysql --without-postgresql --without-threestore --with-regex-library=posix --with-decimal=none --with-www=xml --build=i586-pc-mingw32 --host=i586-pc-mingw32 lt_cv_cc_dll_switch="-shared" CC="$(raptor_CC)" CFLAGS=-D_MT CPPFLAGS="-nostdinc $(INCLUDE)" LDFLAGS="-no-undefined -Wl,--enable-runtime-pseudo-reloc,--export-all-symbols -L$(ILIB:s/;/ -L/)" LIBS="$(raptor_LIBS)" OBJDUMP="$(WRAPCMD) objdump" LIBXML2LIB=$(LIBXML2LIB) XSLTLIB="$(XSLTLIB)"
BUILD_ACTION=$(GNUMAKE)
BUILD_FLAGS+= -j$(EXTMAXPROCESS)
BUILD_DIR=$(CONFIGURE_DIR)
......@@ -118,14 +118,13 @@ LDFLAGS+:=-L$(SYSBASE)$/lib -L$(SYSBASE)$/usr$/lib -lpthread -ldl
.ENDIF
.ENDIF # "$(SYSBASE)"!=""
CPPFLAGS+:=$(EXTRA_CFLAGS)
CPPFLAGS+:=$(EXTRA_CDEFS) $(EXTRA_CFLAGS)
LDFLAGS+:=$(EXTRA_LINKFLAGS)
XSLTLIB!:=$(XSLTLIB) # expand dmake variables for xslt-config
.EXPORT: CPPFLAGS
.EXPORT: LDFLAGS
.EXPORT: LIBXML2LIB
.EXPORT: ZLIB3RDLIB
.EXPORT: XSLTLIB
CONFIGURE_DIR=
......
redland/rasqal/makefile.mk
Dosyayı görüntüle @ aa8f1fb3
......@@ -81,7 +81,7 @@ rasqal_LIBS+=-lstdc++_s
CONFIGURE_DIR=
CONFIGURE_ACTION=.$/configure PATH="..$/..$/..$/bin:$$PATH"
CONFIGURE_FLAGS=--disable-static --disable-gtk-doc --with-openssl-digests --with-xml-parser=libxml --without-bdb --without-sqlite --without-mysql --without-postgresql --without-threestore --disable-pcre --with-decimal=none --with-www=xml --build=i586-pc-mingw32 --host=i586-pc-mingw32 lt_cv_cc_dll_switch="-shared" CC="$(rasqal_CC)" CFLAGS=-D_MT CPPFLAGS="-nostdinc $(INCLUDE)" LDFLAGS="-no-undefined -Wl,--enable-runtime-pseudo-reloc,--export-all-symbols -L$(ILIB:s/;/ -L/)" LIBS="$(rasqal_LIBS)" OBJDUMP="$(WRAPCMD) objdump" LIBXML2LIB=$(LIBXML2LIB) ZLIB3RDLIB=$(ZLIB3RDLIB) XSLTLIB="$(XSLTLIB)"
CONFIGURE_FLAGS=--disable-static --disable-gtk-doc --with-openssl-digests --with-xml-parser=libxml --without-bdb --without-sqlite --without-mysql --without-postgresql --without-threestore --disable-pcre --with-decimal=none --with-www=xml --build=i586-pc-mingw32 --host=i586-pc-mingw32 lt_cv_cc_dll_switch="-shared" CC="$(rasqal_CC)" CFLAGS=-D_MT CPPFLAGS="-nostdinc $(INCLUDE)" LDFLAGS="-no-undefined -Wl,--enable-runtime-pseudo-reloc,--export-all-symbols -L$(ILIB:s/;/ -L/)" LIBS="$(rasqal_LIBS)" OBJDUMP="$(WRAPCMD) objdump" LIBXML2LIB=$(LIBXML2LIB) XSLTLIB="$(XSLTLIB)"
BUILD_ACTION=$(GNUMAKE)
BUILD_FLAGS+= -j$(EXTMAXPROCESS)
BUILD_DIR=$(CONFIGURE_DIR)
......@@ -115,14 +115,13 @@ LDFLAGS+:=-L$(SYSBASE)$/lib -L$(SYSBASE)$/usr$/lib -lpthread -ldl
.ENDIF
.ENDIF # "$(SYSBASE)"!=""
CPPFLAGS+:=$(EXTRA_CFLAGS)
CPPFLAGS+:=$(EXTRA_CDEFS) $(EXTRA_CFLAGS)
LDFLAGS+:=$(EXTRA_LINKFLAGS)
XSLTLIB!:=$(XSLTLIB) # expand dmake variables for xslt-config
.EXPORT: CPPFLAGS
.EXPORT: LDFLAGS
.EXPORT: LIBXML2LIB
.EXPORT: ZLIB3RDLIB
.EXPORT: XSLTLIB
CONFIGURE_DIR=
......
redland/redland/makefile.mk
Dosyayı görüntüle @ aa8f1fb3
......@@ -83,7 +83,7 @@ redland_LIBS+=-lstdc++_s
CONFIGURE_DIR=
CONFIGURE_ACTION=.$/configure PATH="..$/..$/..$/bin:$$PATH"
CONFIGURE_FLAGS=--disable-static --disable-gtk-doc --with-openssl-digests --with-xml-parser=libxml --with-raptor=system --with-rasqual=system --without-bdb --without-sqlite --without-mysql --without-postgresql --without-threestore --with-regex-library=posix --with-decimal=none --with-www=xml --build=i586-pc-mingw32 --host=i586-pc-mingw32 lt_cv_cc_dll_switch="-shared" CC="$(redland_CC)" CFLAGS=-D_MT CPPFLAGS="-nostdinc $(INCLUDE)" LDFLAGS="-no-undefined -Wl,--enable-runtime-pseudo-reloc,--export-all-symbols -L$(ILIB:s/;/ -L/)" LIBS="$(redland_LIBS)" OBJDUMP="$(WRAPCMD) objdump" LIBXML2LIB=$(LIBXML2LIB) ZLIB3RDLIB=$(ZLIB3RDLIB) XSLTLIB="$(XSLTLIB)"
CONFIGURE_FLAGS=--disable-static --disable-gtk-doc --with-openssl-digests --with-xml-parser=libxml --with-raptor=system --with-rasqual=system --without-bdb --without-sqlite --without-mysql --without-postgresql --without-threestore --with-regex-library=posix --with-decimal=none --with-www=xml --build=i586-pc-mingw32 --host=i586-pc-mingw32 lt_cv_cc_dll_switch="-shared" CC="$(redland_CC)" CFLAGS=-D_MT CPPFLAGS="-nostdinc $(INCLUDE)" LDFLAGS="-no-undefined -Wl,--enable-runtime-pseudo-reloc,--export-all-symbols -L$(ILIB:s/;/ -L/)" LIBS="$(redland_LIBS)" OBJDUMP="$(WRAPCMD) objdump" LIBXML2LIB=$(LIBXML2LIB) XSLTLIB="$(XSLTLIB)"
BUILD_ACTION=$(GNUMAKE)
BUILD_FLAGS+= -j$(EXTMAXPROCESS)
BUILD_DIR=$(CONFIGURE_DIR)
......@@ -121,14 +121,13 @@ LDFLAGS+:=-L$(SYSBASE)$/lib -L$(SYSBASE)$/usr$/lib -lpthread -ldl
LDFLAGS+:=-Wl,-dylib_file,@loader_path/libraptor.1.dylib:$(PWD)/$(LB)/libraptor.1.dylib
.ENDIF
CPPFLAGS+:=$(EXTRA_CFLAGS)
CPPFLAGS+:=$(EXTRA_CDEFS) $(EXTRA_CFLAGS)
LDFLAGS+:=$(EXTRA_LINKFLAGS)
XSLTLIB!:=$(XSLTLIB) # expand dmake variables for xslt-config
.EXPORT: CPPFLAGS
.EXPORT: LDFLAGS
.EXPORT: LIBXML2LIB
.EXPORT: ZLIB3RDLIB
.EXPORT: XSLTLIB
CONFIGURE_DIR=
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment