diff options
74 files changed, 981 insertions, 441 deletions
@@ -9,8 +9,14 @@ /*/unxlng??.pro /*/wntmsc??? /*/wntmsc???.pro +/*/wntgcc? +/*/wntgcc?.pro /*/unxmac?? /*/unxmac??.pro +/*/unxios? +/*/unxios?.pro +/*/unxand? +/*/unxand?.pro /external/*/*.dll /external/*/*.txt diff --git a/Mesa/prj/d.lst b/Mesa/prj/d.lst index 5991e20..9690bd4 100644 --- a/Mesa/prj/d.lst +++ b/Mesa/prj/d.lst @@ -1,3 +1,3 @@ -mkdir: %_DEST%\inc%_EXT%\GL +mkdir: %_DEST%\inc\GL -..\inc\*.h %_DEST%\inc%_EXT%\GL\*.h +..\inc\*.h %_DEST%\inc\GL\*.h diff --git a/afms/prj/d.lst b/afms/prj/d.lst index 78396a6..1652d1f 100644 --- a/afms/prj/d.lst +++ b/afms/prj/d.lst @@ -1,3 +1,3 @@ -mkdir: %_DEST%\pck%_EXT% -..\%__SRC%\bin\*.zip %_DEST%\pck%_EXT%\*.zip +mkdir: %_DEST%\pck +..\%__SRC%\bin\*.zip %_DEST%\pck\*.zip diff --git a/apple_remote/prj/d.lst b/apple_remote/prj/d.lst index ef6dd46..8d05687 100644 --- a/apple_remote/prj/d.lst +++ b/apple_remote/prj/d.lst @@ -1,5 +1,5 @@ -mkdir: %_DEST%\inc%_EXT%\apple_remote -..\inc\*.h %_DEST%\inc%_EXT%\apple_remote\* +mkdir: %_DEST%\inc\apple_remote +..\inc\*.h %_DEST%\inc\apple_remote\* -..\%__SRC%\lib\*.dylib %_DEST%\lib%_EXT%\*.dylib +..\%__SRC%\lib\*.dylib %_DEST%\lib\*.dylib diff --git a/beanshell/prj/d.lst b/beanshell/prj/d.lst index 6614623..ea4006c 100644 --- a/beanshell/prj/d.lst +++ b/beanshell/prj/d.lst @@ -1 +1 @@ -..\%__SRC%\misc\build\BeanShell\dist\bsh-2.0b1.jar %_DEST%\bin%_EXT%\bsh.jar +..\%__SRC%\misc\build\BeanShell\dist\bsh-2.0b1.jar %_DEST%\bin\bsh.jar diff --git a/cppunit/makefile.mk b/cppunit/makefile.mk index a842e42..d77f3fa 100644 --- a/cppunit/makefile.mk +++ b/cppunit/makefile.mk @@ -84,13 +84,20 @@ CONFIGURE_FLAGS = --prefix=$(shell cd $(PACKAGE_DIR) && \ LDFLAGS='$(LDFLAGS)' \ LIBS='$(MY_LIBS)' +.IF "$(CROSS_COMPILING)"=="YES" +CONFIGURE_FLAGS+= --build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) +.ENDIF + BUILD_ACTION = $(GNUMAKE) -j$(EXTMAXPROCESS) BUILD_FLAGS = install OUTDIR2INC = ooo-install/include/cppunit +# WTF? A *Cygwin* DLL? +#OUT2BIN = ooo-install/bin/DllPlugInTester.exe \ +# ooo-install/bin/cygcppunit-1-12-1.dll OUT2BIN = ooo-install/bin/DllPlugInTester.exe \ - ooo-install/bin/cygcppunit-1-12-1.dll + ooo-install/bin/libcppunit-1-12-1.dll OUT2LIB = ooo-install/lib/libcppunit.dll.a .INCLUDE: set_ext.mk @@ -119,6 +126,16 @@ CONFIGURE_FLAGS = --prefix=$(shell cd $(PACKAGE_DIR) && \ LDFLAGS='$(LDFLAGS)' \ LIBS='$(MY_LIBS)' +.IF "$(OS)"=="IOS" +CONFIGURE_FLAGS+=--disable-shared +.ELSE +CONFIGURE_FLAGS+=--disable-static +.ENDIF + +.IF "$(CROSS_COMPILING)"=="YES" +CONFIGURE_FLAGS+= --build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) +.ENDIF + BUILD_ACTION = $(GNUMAKE) -j$(EXTMAXPROCESS) BUILD_FLAGS = install @@ -132,6 +149,8 @@ EXTRPATH = NONE OUT2LIB = ooo-install/lib/libcppunit-1.12.a .ELIF "$(OS)" == "OPENBSD" OUT2LIB = ooo-install/lib/libcppunit-1.12.so.1.0 +.ELIF "$(OS)" == "IOS" +OUT2LIB = ooo-install/lib/libcppunit.a .ELSE OUT2LIB = ooo-install/lib/libcppunit-1.12.so.1 .END diff --git a/cppunit/prj/d.lst b/cppunit/prj/d.lst index 29dac2b..a2efb6b 100644 --- a/cppunit/prj/d.lst +++ b/cppunit/prj/d.lst @@ -1,36 +1,38 @@ -mkdir: %_DEST%\inc%_EXT%\cppunit -..\%__SRC%\inc\cppunit\*.h %_DEST%\inc%_EXT%\cppunit\*.h -mkdir: %_DEST%\inc%_EXT%\cppunit\config -..\%__SRC%\inc\cppunit\config\*.h %_DEST%\inc%_EXT%\cppunit\config\*.h -mkdir: %_DEST%\inc%_EXT%\cppunit\extensions -..\%__SRC%\inc\cppunit\extensions\*.h %_DEST%\inc%_EXT%\cppunit\extensions\*.h -mkdir: %_DEST%\inc%_EXT%\cppunit\plugin -..\%__SRC%\inc\cppunit\plugin\*.h %_DEST%\inc%_EXT%\cppunit\plugin\*.h -mkdir: %_DEST%\inc%_EXT%\cppunit\portability -..\%__SRC%\inc\cppunit\portability\*.h %_DEST%\inc%_EXT%\cppunit\portability\*.h -mkdir: %_DEST%\inc%_EXT%\cppunit\tools -..\%__SRC%\inc\cppunit\tools\*.h %_DEST%\inc%_EXT%\cppunit\tools\*.h -mkdir: %_DEST%\inc%_EXT%\cppunit\ui\text -..\%__SRC%\inc\cppunit\ui\text\*.h %_DEST%\inc%_EXT%\cppunit\ui\text\*.h - -..\%__SRC%\bin\cppunit_dll.dll %_DEST%\bin%_EXT%\cppunit_dll.dll -..\%__SRC%\lib\icppunit_dll.lib %_DEST%\lib%_EXT%\icppunit_dll.lib - -..\%__SRC%\bin\cygcppunit-1-12-1.dll %_DEST%\bin%_EXT%\cygcppunit-1-12-1.dll -..\%__SRC%\lib\libcppunit.dll.a %_DEST%\lib%_EXT%\libcppunit.dll.a - -..\%__SRC%\lib\libcppunit-1.12.1.dylib %_DEST%\lib%_EXT%\libcppunit-1.12.1.dylib -symlink: %_DEST%\lib%_EXT%\libcppunit-1.12.1.dylib %_DEST%\lib%_EXT%\libcppunit.dylib - -..\%__SRC%\lib\libcppunit-1.12.so.1 %_DEST%\lib%_EXT%\libcppunit-1.12.so.1 -symlink: %_DEST%\lib%_EXT%\libcppunit-1.12.so.1 %_DEST%\lib%_EXT%\libcppunit.so - -..\%__SRC%\lib\libcppunit-1.12.so.1.0 %_DEST%\lib%_EXT%\libcppunit-1.12.so.1.0 -symlink: %_DEST%\lib%_EXT%\libcppunit-1.12.so.1.0 %_DEST%\lib%_EXT%\libcppunit.so - -..\%__SRC%\lib\libcppunit-1.12.a %_DEST%\lib%_EXT%\libcppunit-1.12.a -symlink: %_DEST%\lib%_EXT%\libcppunit-1.12.a %_DEST%\lib%_EXT%\libcppunit.a - -..\%__SRC%\bin\DllPlugInTester %_DEST%\bin%_EXT%\DllPlugInTester -..\%__SRC%\bin\DllPlugInTester.exe %_DEST%\bin%_EXT%\DllPlugInTester.exe -..\%__SRC%\bin\DllPlugInTester_dll.exe %_DEST%\bin%_EXT%\DllPlugInTester_dll.exe +mkdir: %_DEST%\inc\cppunit +..\%__SRC%\inc\cppunit\*.h %_DEST%\inc\cppunit\*.h +mkdir: %_DEST%\inc\cppunit\config +..\%__SRC%\inc\cppunit\config\*.h %_DEST%\inc\cppunit\config\*.h +mkdir: %_DEST%\inc\cppunit\extensions +..\%__SRC%\inc\cppunit\extensions\*.h %_DEST%\inc\cppunit\extensions\*.h +mkdir: %_DEST%\inc\cppunit\plugin +..\%__SRC%\inc\cppunit\plugin\*.h %_DEST%\inc\cppunit\plugin\*.h +mkdir: %_DEST%\inc\cppunit\portability +..\%__SRC%\inc\cppunit\portability\*.h %_DEST%\inc\cppunit\portability\*.h +mkdir: %_DEST%\inc\cppunit\tools +..\%__SRC%\inc\cppunit\tools\*.h %_DEST%\inc\cppunit\tools\*.h +mkdir: %_DEST%\inc\cppunit\ui\text +..\%__SRC%\inc\cppunit\ui\text\*.h %_DEST%\inc\cppunit\ui\text\*.h + +..\%__SRC%\bin\cppunit_dll.dll %_DEST%\bin\cppunit_dll.dll +..\%__SRC%\lib\icppunit_dll.lib %_DEST%\lib\icppunit_dll.lib + +..\%__SRC%\bin\cygcppunit-1-12-1.dll %_DEST%\bin\cygcppunit-1-12-1.dll +..\%__SRC%\lib\libcppunit.dll.a %_DEST%\lib\libcppunit.dll.a + +..\%__SRC%\lib\libcppunit-1.12.1.dylib %_DEST%\lib\libcppunit-1.12.1.dylib +symlink: %_DEST%\lib\libcppunit-1.12.1.dylib %_DEST%\lib\libcppunit.dylib + +..\%__SRC%\lib\libcppunit-1.12.so.1 %_DEST%\lib\libcppunit-1.12.so.1 +symlink: %_DEST%\lib\libcppunit-1.12.so.1 %_DEST%\lib\libcppunit.so + +..\%__SRC%\lib\libcppunit-1.12.so.1.0 %_DEST%\lib\libcppunit-1.12.so.1.0 +symlink: %_DEST%\lib\libcppunit-1.12.so.1.0 %_DEST%\lib\libcppunit.so + +..\%__SRC%\lib\libcppunit-1.12.a %_DEST%\lib\libcppunit-1.12.a +symlink: %_DEST%\lib\libcppunit-1.12.a %_DEST%\lib\libcppunit.a + +..\%__SRC%\lib\libcppunit.a %_DEST%\lib\libcppunit.a + +..\%__SRC%\bin\DllPlugInTester %_DEST%\bin\DllPlugInTester +..\%__SRC%\bin\DllPlugInTester.exe %_DEST%\bin\DllPlugInTester.exe +..\%__SRC%\bin\DllPlugInTester_dll.exe %_DEST%\bin\DllPlugInTester_dll.exe diff --git a/cppunit/windows.patch b/cppunit/windows.patch index fdd7607..9c510bb 100644 --- a/cppunit/windows.patch +++ b/cppunit/windows.patch @@ -34,3 +34,15 @@ typedef char __CppUnitPlugInImplementMainDummyTypeDef // Unix +--- misc/cppunit-1.12.1/include/cppunit/TestAssert.h ++++ misc/build/cppunit-1.12.1/include/cppunit/TestAssert.h +@@ -76,7 +76,7 @@ + const int precision = 15; + #endif // #ifdef DBL_DIG + char buffer[128]; +-#ifdef __STDC_SECURE_LIB__ // Use secure version with visual studio 2005 to avoid warning. ++#if defined(_MSC_VER) && defined(__STDC_SECURE_LIB__) // Use secure version with visual studio 2005 to avoid warning. + sprintf_s(buffer, sizeof(buffer), "%.*g", precision, x); + #else + sprintf(buffer, "%.*g", precision, x); + diff --git a/epm/prj/d.lst b/epm/prj/d.lst index 5eea5f2..315d3d1 100644 --- a/epm/prj/d.lst +++ b/epm/prj/d.lst @@ -1,3 +1,3 @@ -..\%__SRC%\bin\epm %_DEST%\bin%_EXT%\epm -..\%__SRC%\bin\epminstall %_DEST%\bin%_EXT%\epminstall -..\%__SRC%\bin\mkepmlist %_DEST%\bin%_EXT%\mkepmlist +..\%__SRC%\bin\epm %_DEST%\bin\epm +..\%__SRC%\bin\epminstall %_DEST%\bin\epminstall +..\%__SRC%\bin\mkepmlist %_DEST%\bin\mkepmlist diff --git a/external/gcc3_specific/makefile.mk b/external/gcc3_specific/makefile.mk index 0b18d2c..d40468c 100644 --- a/external/gcc3_specific/makefile.mk +++ b/external/gcc3_specific/makefile.mk @@ -11,6 +11,10 @@ TARGET=gcc3_specific .IF "$(GUI)" == "WNT" +.IF "$(CROSS_COMPILING)" != "YES" +# Don't do any of this weird and presumably obsolete crack when +# cross-compiling + .IF "$(COM)" == "GCC" .IF "$(MINGW_SHARED_GCCLIB)" == "YES" @@ -38,15 +42,13 @@ $(MINGWGXXDLL) : .ENDIF +.ENDIF + .ELSE .IF "$(SYSTEM_STDLIBS)" != "YES" && "$(COMID)"=="gcc3" -.IF "$(OS)"!="MACOSX" -.IF "$(OS)"!="FREEBSD" -.IF "$(OS)"!="NETBSD" -.IF "$(OS)"!="OPENBSD" -.IF "$(OS)"!="DRAGONFLY" +.IF "$(OS)"!="MACOSX" && "$(OS)"!="IOS" && "$(OS)"!="ANDROID" && "$(OS)"!="FREEBSD" && "$(OS)"!="NETBSD" && "$(OS)"!="OPENBSD" && "$(OS)"!="DRAGONFLY" .EXPORT : CC @@ -73,10 +75,6 @@ $(LB)$/libgcc_s.so.$(SHORTSTDC3) : .ENDIF -.ENDIF -.ENDIF -.ENDIF -.ENDIF .ENDIF .ENDIF diff --git a/external/mingwheaders/makefile.mk b/external/mingwheaders/makefile.mk index ccfc958..1928a2c 100644 --- a/external/mingwheaders/makefile.mk +++ b/external/mingwheaders/makefile.mk @@ -33,6 +33,10 @@ TARGET=mingwheaders .IF "$(OS)$(COM)" == "WNTGCC" +.IF "$(CROSS_COMPILING)" != "YES" +# Don't do any of this weird and presumably obsolete crack when +# cross-compiling + # Cygwin and MinGW use different directories for the W32API headers .IF "$(USE_MINGW)" == "cygwin" MINGW_INCLUDE_DIR=$/usr$/include/mingw/ @@ -206,5 +210,7 @@ clean: .ENDIF +.ENDIF + .INCLUDE : target.mk diff --git a/external/prj/d.lst b/external/prj/d.lst index 7809c07..55e10bc 100644 --- a/external/prj/d.lst +++ b/external/prj/d.lst @@ -1,57 +1,57 @@ -mkdir: %_DEST%\inc%_EXT%\external -mkdir: %_DEST%\inc%_EXT%\external\glibc -mkdir: %_DEST%\inc%_EXT%\external\mingw -mkdir: %_DEST%\inc%_EXT%\external\mingw\include -mkdir: %_DEST%\inc%_EXT%\external\mingw\include\atl -mkdir: %_DEST%\inc%_EXT%\external\mingw\include\sys +mkdir: %_DEST%\inc\external +mkdir: %_DEST%\inc\external\glibc +mkdir: %_DEST%\inc\external\mingw +mkdir: %_DEST%\inc\external\mingw\include +mkdir: %_DEST%\inc\external\mingw\include\atl +mkdir: %_DEST%\inc\external\mingw\include\sys -..\glibc\rtufiles\config.h %_DEST%\inc%_EXT%\external\glibc\config.h -..\glibc\rtufiles\getopt.h %_DEST%\inc%_EXT%\external\glibc\getopt.h +..\glibc\rtufiles\config.h %_DEST%\inc\external\glibc\config.h +..\glibc\rtufiles\getopt.h %_DEST%\inc\external\glibc\getopt.h -..\%__SRC%\slb\gnu_getopt.lib %_DEST%\lib%_EXT%\gnu_getopt.lib -..\%__SRC%\lib\libgnu_getopt.a %_DEST%\lib%_EXT%\libgnu_getopt.a -..\%__SRC%\lib\libgnu_getopt_static.a %_DEST%\lib%_EXT%\libgnu_getopt_static.a +..\%__SRC%\slb\gnu_getopt.lib %_DEST%\lib\gnu_getopt.lib +..\%__SRC%\lib\libgnu_getopt.a %_DEST%\lib\libgnu_getopt.a +..\%__SRC%\lib\libgnu_getopt_static.a %_DEST%\lib\libgnu_getopt_static.a -..\%__SRC%\inc\*.h %_DEST%\inc%_EXT%\external\glibc\*.h +..\%__SRC%\inc\*.h %_DEST%\inc\external\glibc\*.h -..\%__SRC%\misc\mingw\include\*.h %_DEST%\inc%_EXT%\external\mingw\include\* -..\%__SRC%\misc\mingw\include\atl\*.h %_DEST%\inc%_EXT%\external\mingw\include\atl\* -..\%__SRC%\misc\mingw\include\sys\*.h %_DEST%\inc%_EXT%\external\mingw\include\sys\* +..\%__SRC%\misc\mingw\include\*.h %_DEST%\inc\external\mingw\include\* +..\%__SRC%\misc\mingw\include\atl\*.h %_DEST%\inc\external\mingw\include\atl\* +..\%__SRC%\misc\mingw\include\sys\*.h %_DEST%\inc\external\mingw\include\sys\* -..\%__SRC%\lib\libautorec*.* %_DEST%\lib%_EXT%\lib*.* +..\%__SRC%\lib\libautorec*.* %_DEST%\lib\lib*.* -..\%__SRC%\lib\libgcc_s.so.* %_DEST%\lib%_EXT%\libgcc_s.so.* -..\%__SRC%\lib\libstdc++.so.* %_DEST%\lib%_EXT%\libstdc++.so.* +..\%__SRC%\lib\libgcc_s.so.* %_DEST%\lib\libgcc_s.so.* +..\%__SRC%\lib\libstdc++.so.* %_DEST%\lib\libstdc++.so.* -..\dbghelp\dbghelp.dll %_DEST%\bin%_EXT%\dbghelp.dll +..\dbghelp\dbghelp.dll %_DEST%\bin\dbghelp.dll -..\gdiplus\gdiplus.dll %_DEST%\bin%_EXT%\gdiplus.dll +..\gdiplus\gdiplus.dll %_DEST%\bin\gdiplus.dll -..\msvcp80\msvcm80*.dll %_DEST%\bin%_EXT% -..\msvcp80\msvcp80*.dll %_DEST%\bin%_EXT% -..\msvcp80\msvcr80*.dll %_DEST%\bin%_EXT% -..\msvcp80\Microsoft.VC80.CRT.manifest %_DEST%\bin%_EXT%\Microsoft.VC80.CRT.manifest -..\msvcp80\Microsoft.VC80.DebugCRT.manifest %_DEST%\bin%_EXT%\Microsoft.VC80.DebugCRT.manifest +..\msvcp80\msvcm80*.dll %_DEST%\bin +..\msvcp80\msvcp80*.dll %_DEST%\bin +..\msvcp80\msvcr80*.dll %_DEST%\bin +..\msvcp80\Microsoft.VC80.CRT.manifest %_DEST%\bin\Microsoft.VC80.CRT.manifest +..\msvcp80\Microsoft.VC80.DebugCRT.manifest %_DEST%\bin\Microsoft.VC80.DebugCRT.manifest -..\msvcp90\msvcm90*.dll %_DEST%\bin%_EXT% -..\msvcp90\msvcp90*.dll %_DEST%\bin%_EXT% -..\msvcp90\msvcr90*.dll %_DEST%\bin%_EXT% -..\msvcp90\Microsoft.VC90.CRT.manifest %_DEST%\bin%_EXT%\Microsoft.VC90.CRT.manifest -..\msvcp90\Microsoft.VC90.DebugCRT.manifest %_DEST%\bin%_EXT%\Microsoft.VC90.DebugCRT.manifest -..\msm90\*.msm %_DEST%\bin%_EXT% +..\msvcp90\msvcm90*.dll %_DEST%\bin +..\msvcp90\msvcp90*.dll %_DEST%\bin +..\msvcp90\msvcr90*.dll %_DEST%\bin +..\msvcp90\Microsoft.VC90.CRT.manifest %_DEST%\bin\Microsoft.VC90.CRT.manifest +..\msvcp90\Microsoft.VC90.DebugCRT.manifest %_DEST%\bin\Microsoft.VC90.DebugCRT.manifest +..\msm90\*.msm %_DEST%\bin -..\unowinreg\unowinreg.dll %_DEST%\bin%_EXT%\unowinreg.dll +..\unowinreg\unowinreg.dll %_DEST%\bin\unowinreg.dll -..\vcredist\vcredist_x86.exe %_DEST%\bin%_EXT%\vcredist_x86.exe -..\vcredist\vcredist_x64.exe %_DEST%\bin%_EXT%\vcredist_x64.exe +..\vcredist\vcredist_x86.exe %_DEST%\bin\vcredist_x86.exe +..\vcredist\vcredist_x64.exe %_DEST%\bin\vcredist_x64.exe -..\%__SRC%\bin\mingwm10.dll %_DEST%\bin%_EXT%\mingwm10.dll -..\%__SRC%\bin\libgcc*.dll %_DEST%\bin%_EXT%\libgcc*.dll -..\%__SRC%\bin\libstdc++*.dll %_DEST%\bin%_EXT%\libstdc++*.dll +..\%__SRC%\bin\mingwm10.dll %_DEST%\bin\mingwm10.dll +..\%__SRC%\bin\libgcc*.dll %_DEST%\bin\libgcc*.dll +..\%__SRC%\bin\libstdc++*.dll %_DEST%\bin\libstdc++*.dll -..\%__SRC%\lib\libmsvcrt*.* %_DEST%\lib%_EXT%\lib*.* +..\%__SRC%\lib\libmsvcrt*.* %_DEST%\lib\lib*.* -..\%__SRC%\lib\lib*static*.dylib %_DEST%\lib%_EXT%\lib*static*.dylib +..\%__SRC%\lib\lib*static*.dylib %_DEST%\lib\lib*static*.dylib linklib: libgcc_s.*.* diff --git a/hsqldb/prj/d.lst b/hsqldb/prj/d.lst index 8801f4f..d432e98 100644 --- a/hsqldb/prj/d.lst +++ b/hsqldb/prj/d.lst @@ -1 +1 @@ -..\%__SRC%\misc\build\hsqldb\lib\hsqldb.jar %_DEST%\bin%_EXT%\hsqldb.jar +..\%__SRC%\misc\build\hsqldb\lib\hsqldb.jar %_DEST%\bin\hsqldb.jar diff --git a/hyphen/hyphen-2.7.1.patch b/hyphen/hyphen-2.7.1.patch index 0e8eafa..f444955 100644 --- a/hyphen/hyphen-2.7.1.patch +++ b/hyphen/hyphen-2.7.1.patch @@ -1,3 +1,14 @@ +--- misc/hyphen-2.7.1/config.sub ++++ misc/build/hyphen-2.7.1/config.sub +@@ -1272,7 +1272,7 @@ + | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \ + | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ + | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ +- | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ ++ | -udi* | -androideabi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ + | -chorusos* | -chorusrdb* \ + | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ + | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \ --- misc/hyphen-2.7.1/Makefile.am 2010-07-19 11:23:17.000000000 +0200 +++ misc/build/hyphen-2.7.1/Makefile.am 2010-12-02 10:15:44.390625000 +0100 @@ -25,14 +25,13 @@ diff --git a/hyphen/makefile.mk b/hyphen/makefile.mk index 94c1592..80f5bbd 100644 --- a/hyphen/makefile.mk +++ b/hyphen/makefile.mk @@ -51,7 +51,11 @@ CONFIGURE_DIR=$(BUILD_DIR) #relative to CONFIGURE_DIR # still needed also in system-hyphen case as it creates the makefile CONFIGURE_ACTION=configure -CONFIGURE_FLAGS= --disable-shared --with-pic +CONFIGURE_FLAGS=--disable-shared + +.IF "$(OS)"!="IOS" +CONFIGURE_FLAGS+= --with-pic +.ENDIF .IF "$(COM)"=="C52" && "$(CPU)"=="U" LCL_CONFIGURE_CFLAGS+=-m64 @@ -82,7 +86,6 @@ OUT2INC += hyphen.h .ENDIF # "$(GUI)"=="UNX" - .IF "$(GUI)"=="WNT" .IF "$(COM)"=="GCC" CONFIGURE_ACTION=configure @@ -96,10 +99,9 @@ BUILD_ACTION=dmake OUT2INC += hyphen.h .ENDIF # "$(GUI)"=="WNT" -.IF "$(GUI)"=="OS2" -BUILD_ACTION=dmake -OUT2INC += hyphen.h -.ENDIF # "$(GUI)"=="OS2" +.IF "$(CROSS_COMPILING)"=="YES" +CONFIGURE_FLAGS+= --build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) +.ENDIF # --- Targets ------------------------------------------------------ diff --git a/hyphen/prj/d.lst b/hyphen/prj/d.lst index 4b7ff0b..4758ed7 100644 --- a/hyphen/prj/d.lst +++ b/hyphen/prj/d.lst @@ -1,5 +1,5 @@ -..\%__SRC%\slb\hyphen.lib %_DEST%\lib%_EXT%\hyphen.lib +..\%__SRC%\slb\hyphen.lib %_DEST%\lib\hyphen.lib -..\%__SRC%\inc\hyphen.h %_DEST%\inc%_EXT%\hyphen.h -..\%__SRC%\misc\build\hyphen-2.7.1\.libs\libhyphen.a %_DEST%\lib%_EXT%\libhyphen.a -..\%__SRC%\misc\build\hyphen-2.7.1\hyph_en_US.dic %_DEST%\bin%_EXT%\hyph_en_US.dic +..\%__SRC%\inc\hyphen.h %_DEST%\inc\hyphen.h +..\%__SRC%\misc\build\hyphen-2.7.1\.libs\libhyphen.a %_DEST%\lib\libhyphen.a +..\%__SRC%\misc\build\hyphen-2.7.1\hyph_en_US.dic %_DEST%\bin\hyph_en_US.dic diff --git a/icc/makefile.mk b/icc/makefile.mk index 4bbde85..779def4 100644 --- a/icc/makefile.mk +++ b/icc/makefile.mk @@ -48,13 +48,17 @@ CONVERTFILES= \ Contrib$/ICC_utils$/Stubs.h \ Contrib$/ICC_utils$/Vetters.cpp +.IF "$(CROSS_COMPILING)"!="YES" CONFIGURE_ACTION= $(GNUCOPY) -r $(BACK_PATH)..$/source$/create_sRGB_profile Contrib$/CmdLine && unzip -o $(BACK_PATH)..$/makefiles.zip BUILD_ACTION=dmake && cd Contrib$/CmdLine$/create_sRGB_profile && $(AUGMENT_LIBRARY_PATH) .$/create_sRGB_profile +.ELSE +CONFIGURE_ACTION= +BUILD_ACTION = (cd $(BACK_PATH)../$(INPATH_FOR_BUILD)/misc/build/SampleICC* && tar cf - Contrib/CmdLine/create_sRGB_profile/sRGB*.hxx) | tar xvf - +.ENDIF + # --- Targets ------------------------------------------------------ .INCLUDE : set_ext.mk .INCLUDE : target.mk .INCLUDE : tg_ext.mk - - diff --git a/icc/prj/d.lst b/icc/prj/d.lst index 864e947..553de38 100644 --- a/icc/prj/d.lst +++ b/icc/prj/d.lst @@ -1,5 +1,5 @@ -mkdir: %_DEST%\inc%_EXT%\icc -mkdir: %_DEST%\inc%_EXT%\external\icc +mkdir: %_DEST%\inc\icc +mkdir: %_DEST%\inc\external\icc -..\%__SRC%\misc\build\SampleICC*\Contrib\CmdLine\create_sRGB_profile\sRGB*.hxx %_DEST%\inc%_EXT%\icc\sRGB*.hxx +..\%__SRC%\misc\build\SampleICC*\Contrib\CmdLine\create_sRGB_profile\sRGB*.hxx %_DEST%\inc\icc\sRGB*.hxx diff --git a/libtextcat/libtextcat-2.2.patch b/libtextcat/libtextcat-2.2.patch index ca7a26c..0a2e5d7 100644 --- a/libtextcat/libtextcat-2.2.patch +++ b/libtextcat/libtextcat-2.2.patch @@ -1,5 +1,5 @@ ---- misc/libtextcat-2.2/configure Thu May 22 13:39:55 2003 -+++ misc/build/libtextcat-2.2/configure Mon Mar 31 11:29:14 2008 +--- misc/build/libtextcat-2.2/configure ++++ misc/build/libtextcat-2.2/configure @@ -3451,7 +3451,7 @@ ;; @@ -366,6 +366,25 @@ lastnonspace = w; } *w++ = *p++; +@@ -386,3 +386,18 @@ + return dest; + } + ++void * ++rpl_malloc (size_t n) ++{ ++ if (n == 0) ++ n = 1; ++ return malloc (n); ++} ++ ++void * ++rpl_realloc (void *ptr, size_t n) ++{ ++ if (n == 0) ++ n = 1; ++ return realloc (ptr, n); ++} --- misc/libtextcat-2.2/src/common.h Thu May 22 15:02:29 2003 +++ misc/build/libtextcat-2.2/src/common.h Mon Mar 31 11:29:14 2008 @@ -1,28 +1,28 @@ @@ -3878,7 +3897,7 @@ -solaris1 | -solaris1.*) os=`echo $os | sed -e 's|solaris1|sunos4|'` ;; -@@ -1100,24 +1286,30 @@ +@@ -1100,24 +1286,31 @@ # Each alternative MUST END IN A *, to match a version number. # -sysv* is not here because it comes later, after sysvr4. -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \ @@ -3901,6 +3920,7 @@ | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ - | -chorusos* | -chorusrdb* \ ++ | -androideabi* \ + | -chorusos* | -chorusrdb* | -cegcc* \ | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ - | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \ diff --git a/libtextcat/makefile.mk b/libtextcat/makefile.mk index 83a1e42..d47c130 100644 --- a/libtextcat/makefile.mk +++ b/libtextcat/makefile.mk @@ -64,17 +64,29 @@ CONFIGURE_FLAGS=$(eq,$(OS),MACOSX CPPFLAGS="$(EXTRA_CDEFS)" $(NULL)) .IF "$(OS)"=="AIX" CONFIGURE_FLAGS+= CFLAGS=-D_LINUX_SOURCE_COMPAT .ENDIF +.IF "$(OS)"=="IOS" +CONFIGURE_FLAGS+= --disable-shared +.ENDIF +.IF "$(CROSS_COMPILING)"=="YES" +CONFIGURE_FLAGS+= --build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) +.ENDIF BUILD_ACTION=make +.IF "$(OS)"=="ANDROID" +# The libtool in the libtextcat-2.2 tarball doesn't build +# shared libraries on Android, for some reason. +OUT2LIB=$(BUILD_DIR)$/src$/.libs$/libtextcat*.a +.ELSE OUT2LIB=$(BUILD_DIR)$/src$/.libs$/libtextcat*$(DLLPOST) +.ENDIF .ENDIF # "$(GUI)"=="UNX" -.IF "$(GUI)"=="WNT" || "$(GUI)"=="OS2" +.IF "$(GUI)"=="WNT" BUILD_ACTION=cd src && dmake $(MAKEMACROS) -.ENDIF # "$(GUI)"=="WNT" || "$(GUI)"=="OS2" +.ENDIF # "$(GUI)"=="WNT" OUT2INC= \ diff --git a/libtextcat/prj/d.lst b/libtextcat/prj/d.lst index 0e7f563..9e060ae 100644 --- a/libtextcat/prj/d.lst +++ b/libtextcat/prj/d.lst @@ -1,12 +1,12 @@ -..\%__SRC%\lib\lib*.* %_DEST%\lib%_EXT%\lib*.* -..\%__SRC%\lib\ilib*.* %_DEST%\lib%_EXT%\ilib*.* -..\%__SRC%\bin\l*.dll %_DEST%\bin%_EXT%\*.dll +..\%__SRC%\lib\lib*.* %_DEST%\lib\lib*.* +..\%__SRC%\lib\ilib*.* %_DEST%\lib\ilib*.* +..\%__SRC%\bin\l*.dll %_DEST%\bin\*.dll -mkdir: %_DEST%\inc%_EXT%\libtextcat -..\%__SRC%\misc\build\libtextcat-2.2\src\*.h %_DEST%\inc%_EXT%\libtextcat\*.h +mkdir: %_DEST%\inc\libtextcat +..\%__SRC%\misc\build\libtextcat-2.2\src\*.h %_DEST%\inc\libtextcat\*.h # data for language guessing -..\data\new_fingerprints\fpdb.conf %COMMON_DEST%\pck%_EXT%\fpdb.conf -..\data\new_fingerprints\lm\*.lm %COMMON_DEST%\pck%_EXT%\*.lm +..\data\new_fingerprints\fpdb.conf %COMMON_DEST%\pck\fpdb.conf +..\data\new_fingerprints\lm\*.lm %COMMON_DEST%\pck\*.lm diff --git a/libvisio/libvisio-android.patch b/libvisio/libvisio-android.patch new file mode 100644 index 0000000..b547913 --- /dev/null +++ b/libvisio/libvisio-android.patch @@ -0,0 +1,14 @@ +--- misc/build/libvisio-0.0.0/src/lib/VSDSVGGenerator.cpp ++++ misc/build/libvisio-0.0.0/src/lib/VSDSVGGenerator.cpp +@@ -33,7 +33,11 @@ + { + std::ostringstream tempStream; + tempStream << value; ++#ifndef __ANDROID__ + std::string decimalPoint(localeconv()->decimal_point); ++#else ++ std::string decimalPoint("."); ++#endif + if ((decimalPoint.size() == 0) || (decimalPoint == ".")) + return tempStream.str(); + std::string stringValue(tempStream.str()); diff --git a/libvisio/libvisio-mingw-cross.patch b/libvisio/libvisio-mingw-cross.patch new file mode 100644 index 0000000..0a29ff1 --- /dev/null +++ b/libvisio/libvisio-mingw-cross.patch @@ -0,0 +1,11 @@ +--- misc/build/libvisio-0.0.0/src/lib/makefile.mk ++++ misc/build/libvisio-0.0.0/src/lib/makefile.mk +@@ -9,7 +9,7 @@ + + .INCLUDE : settings.mk + +-.IF "$(GUI)"=="WNT" ++.IF "$(COM)"=="MSC" + CFLAGS+=-GR + .ENDIF + .IF "$(COM)"=="GCC" diff --git a/libvisio/makefile.mk b/libvisio/makefile.mk new file mode 100644 index 0000000..7f2cbf3 --- /dev/null +++ b/libvisio/makefile.mk @@ -0,0 +1,71 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2000, 2010 Oracle and/or its affiliates. +# +# OpenOffice.org - a multi-platform office productivity suite +# +# 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. +# +#************************************************************************* + +PRJ=. + +PRJNAME=visio +TARGET=visio + +# --- Settings ----------------------------------------------------- + +.INCLUDE : settings.mk + +# --- Files -------------------------------------------------------- + +.IF "$(SYSTEM_LIBVISIO)" == "YES" +@all: + @echo "Using system libvisio..." +.ENDIF + +# libvisio depends on the libwpd and libwpg +.IF "$(SYSTEM_LIBWPD)" == "YES" +INCPRE+=$(LIBWPD_CFLAGS) +.ELSE +INCPRE+=$(SOLARVER)$/$(UPD)$/$(INPATH)$/inc$/libwpd +INCPRE+=$(SOLARVER)$/$(UPD)$/$(INPATH)$/inc$/libwpd-stream +.ENDIF +.IF "$(SYSTEM_LIBWPG)" == "YES" +INCPRE+=$(LIBWPG_CFLAGS) +.ELSE +INCPRE+=$(SOLARVER)$/$(UPD)$/$(INPATH)$/inc$/libwpg +.ENDIF + +TARFILE_NAME=libvisio-0.0.0 +TARFILE_MD5=763bb9b14eec5ba9a533d7a9279301db + +PATCH_FILES=\ + libvisio-mingw-cross.patch \ + libvisio-android.patch + +BUILD_ACTION=dmake $(MFLAGS) $(CALLMACROS) +BUILD_DIR=src$/lib + +# --- Targets ------------------------------------------------------ + +.INCLUDE : set_ext.mk +.INCLUDE : target.mk +.INCLUDE : tg_ext.mk diff --git a/libvisio/prj/build.lst b/libvisio/prj/build.lst new file mode 100644 index 0000000..7ce8628 --- /dev/null +++ b/libvisio/prj/build.lst @@ -0,0 +1,3 @@ +vsd libvisio : LIBWPD:libwpd LIBWPG:libwpg soltools NULL +vsd libvisio usr1 - all vsd_mkout NULL +vsd libvisio nmake - all vsd_libvisio NULL diff --git a/libvisio/prj/d.lst b/libvisio/prj/d.lst new file mode 100644 index 0000000..f03b25b --- /dev/null +++ b/libvisio/prj/d.lst @@ -0,0 +1,5 @@ +mkdir: %_DEST%\inc\libvisio +..\%__SRC%\misc\build\libvisio*\src\lib\libvisio.h %_DEST%\inc\libvisio +..\%__SRC%\misc\build\libvisio*\src\lib\VisioDocument.h %_DEST%\inc\libvisio\ +..\%__SRC%\lib\*.a %_DEST%\lib\*.a +..\%__SRC%\slb\*.lib %_DEST%\lib\*.lib diff --git a/libwpd/libwpd-0.9.2.patch b/libwpd/libwpd-0.9.2.patch new file mode 100644 index 0000000..2fc7074 --- /dev/null +++ b/libwpd/libwpd-0.9.2.patch @@ -0,0 +1,14 @@ +--- misc/build/libwpd-0.9.2/src/lib/libwpd_internal.cpp ++++ misc/build/libwpd-0.9.2/src/lib/libwpd_internal.cpp +@@ -1229,7 +1229,11 @@ + tempString.sprintf("0.0000"); + else + tempString.sprintf("%.4f", value); ++#ifndef __ANDROID__ + std::string decimalPoint(localeconv()->decimal_point); ++#else ++ std::string decimalPoint("."); ++#endif + if ((decimalPoint.size() == 0) || (decimalPoint == ".")) + return tempString; + std::string stringValue(tempString.cstr()); diff --git a/libwpd/makefile.mk b/libwpd/makefile.mk index a8b17ff..8761bbb 100644 --- a/libwpd/makefile.mk +++ b/libwpd/makefile.mk @@ -43,6 +43,9 @@ TARGET=wpd TARFILE_NAME=libwpd-0.9.2 TARFILE_MD5=8d265a592619166f29c4672ea54812b7 + +PATCH_FILES=$(TARFILE_NAME).patch + BUILD_ACTION=dmake $(MFLAGS) $(CALLMACROS) BUILD_DIR=src$/lib diff --git a/libwpd/prj/d.lst b/libwpd/prj/d.lst index ef69443..f891f3b 100644 --- a/libwpd/prj/d.lst +++ b/libwpd/prj/d.lst @@ -1,15 +1,15 @@ -mkdir: %_DEST%\inc%_EXT%\libwpd -mkdir: %_DEST%\inc%_EXT%\libwpd-stream -..\%__SRC%\misc\build\libwpd*\src\lib\libwpd.h %_DEST%\inc%_EXT%\libwpd\ -..\%__SRC%\misc\build\libwpd*\src\lib\WPDocument.h %_DEST%\inc%_EXT%\libwpd\ -..\%__SRC%\misc\build\libwpd*\src\lib\WPXBinaryData.h %_DEST%\inc%_EXT%\libwpd\ -..\%__SRC%\misc\build\libwpd*\src\lib\WPXDocumentInterface.h %_DEST%\inc%_EXT%\libwpd\ -..\%__SRC%\misc\build\libwpd*\src\lib\WPXProperty.h %_DEST%\inc%_EXT%\libwpd\ -..\%__SRC%\misc\build\libwpd*\src\lib\WPXPropertyList.h %_DEST%\inc%_EXT%\libwpd\ -..\%__SRC%\misc\build\libwpd*\src\lib\WPXString.h %_DEST%\inc%_EXT%\libwpd\ -..\%__SRC%\misc\build\libwpd*\src\lib\WPXPropertyListVector.h %_DEST%\inc%_EXT%\libwpd\ -..\%__SRC%\misc\build\libwpd*\src\lib\libwpd-stream.h %_DEST%\inc%_EXT%\libwpd-stream\ -..\%__SRC%\misc\build\libwpd*\src\lib\WPXStream.h %_DEST%\inc%_EXT%\libwpd-stream\ -..\%__SRC%\misc\build\libwpd*\src\lib\WPXStreamImplementation.h %_DEST%\inc%_EXT%\libwpd-stream\ -..\%__SRC%\lib\*.a %_DEST%\lib%_EXT%\*.a -..\%__SRC%\slb\*.lib %_DEST%\lib%_EXT%\*.lib +mkdir: %_DEST%\inc\libwpd +mkdir: %_DEST%\inc\libwpd-stream +..\%__SRC%\misc\build\libwpd*\src\lib\libwpd.h %_DEST%\inc\libwpd\ +..\%__SRC%\misc\build\libwpd*\src\lib\WPDocument.h %_DEST%\inc\libwpd\ +..\%__SRC%\misc\build\libwpd*\src\lib\WPXBinaryData.h %_DEST%\inc\libwpd\ +..\%__SRC%\misc\build\libwpd*\src\lib\WPXDocumentInterface.h %_DEST%\inc\libwpd\ +..\%__SRC%\misc\build\libwpd*\src\lib\WPXProperty.h %_DEST%\inc\libwpd\ +..\%__SRC%\misc\build\libwpd*\src\lib\WPXPropertyList.h %_DEST%\inc\libwpd\ +..\%__SRC%\misc\build\libwpd*\src\lib\WPXString.h %_DEST%\inc\libwpd\ +..\%__SRC%\misc\build\libwpd*\src\lib\WPXPropertyListVector.h %_DEST%\inc\libwpd\ +..\%__SRC%\misc\build\libwpd*\src\lib\libwpd-stream.h %_DEST%\inc\libwpd-stream\ +..\%__SRC%\misc\build\libwpd*\src\lib\WPXStream.h %_DEST%\inc\libwpd-stream\ +..\%__SRC%\misc\build\libwpd*\src\lib\WPXStreamImplementation.h %_DEST%\inc\libwpd-stream\ +..\%__SRC%\lib\*.a %_DEST%\lib\*.a +..\%__SRC%\slb\*.lib %_DEST%\lib\*.lib diff --git a/libwpg/libwpg-0.2.0.patch b/libwpg/libwpg-0.2.0.patch new file mode 100644 index 0000000..86567b1 --- /dev/null +++ b/libwpg/libwpg-0.2.0.patch @@ -0,0 +1,14 @@ +--- misc/build/libwpg-0.2.0/src/lib/WPGSVGGenerator.cpp ++++ misc/build/libwpg-0.2.0/src/lib/WPGSVGGenerator.cpp +@@ -30,7 +30,11 @@ + { + std::ostringstream tempStream; + tempStream << value; ++#ifndef __ANDROID__ + std::string decimalPoint(localeconv()->decimal_point); ++#else ++ std::string decimalPoint("."); ++#endif + if ((decimalPoint.size() == 0) || (decimalPoint == ".")) + return tempStream.str(); + std::string stringValue(tempStream.str()); diff --git a/libwpg/makefile.mk b/libwpg/makefile.mk index 0fa701f..44eccce 100644 --- a/libwpg/makefile.mk +++ b/libwpg/makefile.mk @@ -51,6 +51,10 @@ INCPRE+=$(SOLARVER)$/$(UPD)$/$(INPATH)$/inc$/libwpd-stream TARFILE_NAME=libwpg-0.2.0 TARFILE_MD5=5ba6a61a2f66dfd5fee8cdd4cd262a37 + +PATCH_FILES=$(TARFILE_NAME).patch + + BUILD_ACTION=dmake $(MFLAGS) $(CALLMACROS) BUILD_DIR=src/lib diff --git a/libwpg/prj/d.lst b/libwpg/prj/d.lst index 2093e0d..a6a84a3 100644 --- a/libwpg/prj/d.lst +++ b/libwpg/prj/d.lst @@ -1,6 +1,6 @@ -mkdir: %_DEST%\inc%_EXT%\libwpg -..\%__SRC%\misc\build\libwpg*\src\lib\libwpg.h %_DEST%\inc%_EXT%\libwpg\ -..\%__SRC%\misc\build\libwpg*\src\lib\WPGPaintInterface.h %_DEST%\inc%_EXT%\libwpg\ -..\%__SRC%\misc\build\libwpg*\src\lib\WPGraphics.h %_DEST%\inc%_EXT%\libwpg\ -..\%__SRC%\lib\*.a %_DEST%\lib%_EXT%\*.a -..\%__SRC%\slb\*.lib %_DEST%\lib%_EXT%\*.lib +mkdir: %_DEST%\inc\libwpg +..\%__SRC%\misc\build\libwpg*\src\lib\libwpg.h %_DEST%\inc\libwpg\ +..\%__SRC%\misc\build\libwpg*\src\lib\WPGPaintInterface.h %_DEST%\inc\libwpg\ +..\%__SRC%\misc\build\libwpg*\src\lib\WPGraphics.h %_DEST%\inc\libwpg\ +..\%__SRC%\lib\*.a %_DEST%\lib\*.a +..\%__SRC%\slb\*.lib %_DEST%\lib\*.lib diff --git a/libwps/makefile.mk b/libwps/makefile.mk index edb36cd..fe1792c 100644 --- a/libwps/makefile.mk +++ b/libwps/makefile.mk @@ -49,13 +49,11 @@ INCPRE+=$(SOLARVER)$/$(UPD)$/$(INPATH)$/inc$/libwpd INCPRE+=$(SOLARVER)$/$(UPD)$/$(INPATH)$/inc$/libwpd-stream .ENDIF -TARFILE_NAME=libwps-0.2.1 -TARFILE_MD5=83d4029aebf290c0a9a8fee9c99638d3 +TARFILE_NAME=libwps-0.2.2 +TARFILE_MD5=29721a16f25967d59969d5f0ae485b4a BUILD_ACTION=dmake $(MFLAGS) $(CALLMACROS) BUILD_DIR=src/lib -PATCH_FILES=libwps-0.2.1.patch libwps-0.2.1-warnings.patch - # --- Targets ------------------------------------------------------ .INCLUDE : set_ext.mk diff --git a/libwps/prj/d.lst b/libwps/prj/d.lst index a71985a..3923a18 100644 --- a/libwps/prj/d.lst +++ b/libwps/prj/d.lst @@ -1,5 +1,5 @@ -mkdir: %_DEST%\inc%_EXT%\libwps -..\%__SRC%\misc\build\libwps*\src\lib\libwps.h %_DEST%\inc%_EXT%\libwps\ -..\%__SRC%\misc\build\libwps*\src\lib\WPSDocument.h %_DEST%\inc%_EXT%\libwps\ -..\%__SRC%\lib\*.a %_DEST%\lib%_EXT%\*.a -..\%__SRC%\slb\*.lib %_DEST%\lib%_EXT%\*.lib +mkdir: %_DEST%\inc\libwps +..\%__SRC%\misc\build\libwps*\src\lib\libwps.h %_DEST%\inc\libwps\ +..\%__SRC%\misc\build\libwps*\src\lib\WPSDocument.h %_DEST%\inc\libwps\ +..\%__SRC%\lib\*.a %_DEST%\lib\*.a +..\%__SRC%\slb\*.lib %_DEST%\lib\*.lib diff --git a/libxmlsec/prj/d.lst b/libxmlsec/prj/d.lst index 064bd9e..21896b5 100644 --- a/libxmlsec/prj/d.lst +++ b/libxmlsec/prj/d.lst @@ -1,9 +1,9 @@ -mkdir: %_DEST%\inc%_EXT%\external\xmlsec -mkdir: %_DEST%\inc%_EXT%\external\xmlsec\nss -mkdir: %_DEST%\inc%_EXT%\external\xmlsec\mscrypto -..\%__SRC%\inc\xmlsec\*.h %_DEST%\inc%_EXT%\external\xmlsec\*.h -..\%__SRC%\inc\xmlsec\nss\*.h %_DEST%\inc%_EXT%\external\xmlsec\nss\*.h -..\%__SRC%\inc\xmlsec\mscrypto\*.h %_DEST%\inc%_EXT%\external\xmlsec\mscrypto\*.h -..\%__SRC%\lib\lib*.a %_DEST%\lib%_EXT% -..\%__SRC%\lib\*.lib %_DEST%\lib%_EXT% -..\%__SRC%\bin\*.dll %_DEST%\bin%_EXT% +mkdir: %_DEST%\inc\external\xmlsec +mkdir: %_DEST%\inc\external\xmlsec\nss +mkdir: %_DEST%\inc\external\xmlsec\mscrypto +..\%__SRC%\inc\xmlsec\*.h %_DEST%\inc\external\xmlsec\*.h +..\%__SRC%\inc\xmlsec\nss\*.h %_DEST%\inc\external\xmlsec\nss\*.h +..\%__SRC%\inc\xmlsec\mscrypto\*.h %_DEST%\inc\external\xmlsec\mscrypto\*.h +..\%__SRC%\lib\lib*.a %_DEST%\lib +..\%__SRC%\lib\*.lib %_DEST%\lib +..\%__SRC%\bin\*.dll %_DEST%\bin diff --git a/lpsolve/lp_solve_5.5-openbsd.patch b/lpsolve/lp_solve_5.5-openbsd.patch deleted file mode 100644 index d632d91..0000000 --- a/lpsolve/lp_solve_5.5-openbsd.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- misc/lp_solve_5.5/lpsolve55/ccc Fri Nov 5 13:51:18 2010 -+++ misc/build/lp_solve_5.5/lpsolve55/ccc Fri Nov 5 13:51:11 2010 -@@ -6,7 +6,7 @@ - if [ "$PLATFORM" = "SCO_UNIX" ] - then def='-dy -K PIC -DNOLONGLONG' - dl=-lc --else dl=-ldl -+else - so=y - fi - -@@ -19,7 +19,7 @@ - if [ "$so" != "" ] - then - $c -fpic -s -c -I.. -I../shared -I../bfp -I../bfp/bfp_LUSOL -I../bfp/bfp_LUSOL/LUSOL -I../colamd -I. $opts -DYY_NEVER_INTERACTIVE -DPARSER_LP -DINVERSE_ACTIVE=INVERSE_LUSOL -DRoleIsExternalInvEngine $src -- $c -shared -Wl,-Bsymbolic -Wl,-soname,liblpsolve55.so -o liblpsolve55.so `echo $src|sed s/[.]c/.o/g|sed 's/[^ ]*\///g'` -lc -lm -ldl -+ $c -shared -Wl,-Bsymbolic -Wl,-soname,liblpsolve55.so -o liblpsolve55.so `echo $src|sed s/[.]c/.o/g|sed 's/[^ ]*\///g'` -lc -lm - fi - - rm *.o 2>/dev/null diff --git a/lpsolve/lp_solve_5.5.patch b/lpsolve/lp_solve_5.5.patch index c6c7806..5edcd0d 100644 --- a/lpsolve/lp_solve_5.5.patch +++ b/lpsolve/lp_solve_5.5.patch @@ -1,31 +1,53 @@ ---- misc/lp_solve_5.5/lpsolve55/ccc Sat Jun 11 21:27:18 2005 -+++ misc/build/lp_solve_5.5/lpsolve55/ccc Wed May 21 17:19:56 2008 -@@ -1,5 +1,5 @@ +--- misc/build/lp_solve_5.5/lpsolve55/ccc.orig Sat Jun 11 21:27:18 2005 ++++ misc/build/lp_solve_5.5/lpsolve55/ccc Sun May 22 11:20:19 2011 +@@ -1,15 +1,28 @@ src='../lp_MDO.c ../shared/commonlib.c ../shared/mmio.c ../shared/myblas.c ../ini.c ../fortify.c ../colamd/colamd.c ../lp_rlp.c ../lp_crash.c ../bfp/bfp_LUSOL/lp_LUSOL.c ../bfp/bfp_LUSOL/LUSOL/lusol.c ../lp_Hash.c ../lp_lib.c ../lp_wlp.c ../lp_matrix.c ../lp_mipbb.c ../lp_MPS.c ../lp_params.c ../lp_presolve.c ../lp_price.c ../lp_pricePSE.c ../lp_report.c ../lp_scale.c ../lp_simplex.c ../lp_SOS.c ../lp_utils.c ../yacc_read.c' -c=cc +c=$CC def= so= ---- misc/lp_solve_5.5/lpsolve55/ccc.os2 2008-11-26 12:49:36.000000000 +0100 -+++ misc/build/lp_solve_5.5/lpsolve55/ccc.os2 2008-09-25 17:27:48.000000000 +0200 -@@ -1 +1,13 @@ --dummy -+src='../lp_MDO.c ../shared/commonlib.c ../shared/mmio.c ../shared/myblas.c ../ini.c ../fortify.c ../colamd/colamd.c ../lp_rlp.c ../lp_crash.c ../bfp/bfp_LUSOL/lp_LUSOL.c ../bfp/bfp_LUSOL/LUSOL/lusol.c ../lp_Hash.c ../lp_lib.c ../lp_wlp.c ../lp_matrix.c ../lp_mipbb.c ../lp_MPS.c ../lp_params.c ../lp_presolve.c ../lp_price.c ../lp_pricePSE.c ../lp_report.c ../lp_scale.c ../lp_simplex.c ../lp_SOS.c ../lp_utils.c ../yacc_read.c' -+c=$CC -+ -+def= -+so= -+ -+opts='-O3' -+ -+$c -s -c -Zomf -I.. -I../shared -I../bfp -I../bfp/bfp_LUSOL -I../bfp/bfp_LUSOL/LUSOL -I../colamd $opts $def -DYY_NEVER_INTERACTIVE -DPARSER_LP -DINVERSE_ACTIVE=INVERSE_LUSOL -DRoleIsExternalInvEngine $src -+emxomfar rv liblpsolve55.lib `echo $src|sed s/[.]c/.o/g|sed 's/[^ ]*\///g'` -+echo liblpsolve55.a +-if [ "$PLATFORM" = "SCO_UNIX" ] +-then def='-dy -K PIC -DNOLONGLONG' +- dl=-lc +-else dl=-ldl +- so=y ++soprefix= ++libs= ++pic= ++ldflags= ++inline= ++if [ "$GUI" = "WNT" -a "$COM" = "GCC" ]; then ++ so=dll ++ inline=-DINLINE=static ++else ++ so=so ++ soprefix=lib ++ libs="-lm" ++ pic=-fpic ++ ldflags="-Wl,-Bsymbolic -Wl,-soname,liblpsolve55.$so" + fi + ++if [ "$OS" = "LINUX" ]; then ++ libs="$libs -ldl" ++fi + -+rm *.o 2>/dev/null ---- misc/lp_solve_5.5/lpsolve55/ccc.osx Thu Jun 23 22:53:08 2005 -+++ misc/build/lp_solve_5.5/lpsolve55/ccc.osx Wed May 21 17:19:56 2008 + opts='-O3' + + $c -s -c -I.. -I../shared -I../bfp -I../bfp/bfp_LUSOL -I../bfp/bfp_LUSOL/LUSOL -I../colamd $opts $def -DYY_NEVER_INTERACTIVE -DPARSER_LP -DINVERSE_ACTIVE=INVERSE_LUSOL -DRoleIsExternalInvEngine $src +@@ -18,8 +31,8 @@ + + if [ "$so" != "" ] + then +- $c -fpic -s -c -I.. -I../shared -I../bfp -I../bfp/bfp_LUSOL -I../bfp/bfp_LUSOL/LUSOL -I../colamd -I. $opts -DYY_NEVER_INTERACTIVE -DPARSER_LP -DINVERSE_ACTIVE=INVERSE_LUSOL -DRoleIsExternalInvEngine $src +- $c -shared -Wl,-Bsymbolic -Wl,-soname,liblpsolve55.so -o liblpsolve55.so `echo $src|sed s/[.]c/.o/g|sed 's/[^ ]*\///g'` -lc -lm -ldl ++ $c $pic -s $inline -c -I.. -I../shared -I../bfp -I../bfp/bfp_LUSOL -I../bfp/bfp_LUSOL/LUSOL -I../colamd -I. $opts -DYY_NEVER_INTERACTIVE -DPARSER_LP -DINVERSE_ACTIVE=INVERSE_LUSOL -DRoleIsExternalInvEngine $src ++ $c -shared $ldflags -o ${soprefix}lpsolve55.$so `echo $src|sed s/[.]c/.o/g|sed 's/[^ ]*\///g'` $libs + fi + + rm *.o 2>/dev/null +--- misc/build/lp_solve_5.5/lpsolve55/ccc.osx.orig Thu Jun 23 22:53:08 2005 ++++ misc/build/lp_solve_5.5/lpsolve55/ccc.osx Sun May 22 11:19:48 2011 @@ -1,8 +1,12 @@ src='../lp_MDO.c ../shared/commonlib.c ../shared/mmio.c ../shared/myblas.c ../ini.c ../fortify.c ../colamd/colamd.c ../lp_rlp.c ../lp_crash.c ../bfp/bfp_LUSOL/lp_LUSOL.c ../bfp/bfp_LUSOL/LUSOL/lusol.c ../lp_Hash.c ../lp_lib.c ../lp_wlp.c ../lp_matrix.c ../lp_mipbb.c ../lp_MPS.c ../lp_params.c ../lp_presolve.c ../lp_price.c ../lp_pricePSE.c ../lp_report.c ../lp_scale.c ../lp_simplex.c ../lp_SOS.c ../lp_utils.c ../yacc_read.c' -c=cc @@ -57,9 +79,9 @@ fi rm *.o 2>/dev/null ---- misc/lp_solve_5.5/lpsolve55/ccc.solaris Wed May 21 17:45:07 2008 -+++ misc/build/lp_solve_5.5/lpsolve55/ccc.solaris Wed May 21 17:44:54 2008 -@@ -1,1 +1,31 @@ +--- misc/build/lp_solve_5.5/lpsolve55/ccc.solaris.orig Sun May 22 11:19:48 2011 ++++ misc/build/lp_solve_5.5/lpsolve55/ccc.solaris Sun May 22 11:19:48 2011 +@@ -1 +1,31 @@ -dummy +src='../lp_MDO.c ../shared/commonlib.c ../shared/mmio.c ../shared/myblas.c ../ini.c ../fortify.c ../colamd/colamd.c ../lp_rlp.c ../lp_crash.c ../bfp/bfp_LUSOL/lp_LUSOL.c ../bfp/bfp_LUSOL/LUSOL/lusol.c ../lp_Hash.c ../lp_lib.c ../lp_wlp.c ../lp_matrix.c ../lp_mipbb.c ../lp_MPS.c ../lp_params.c ../lp_presolve.c ../lp_price.c ../lp_pricePSE.c ../lp_report.c ../lp_scale.c ../lp_simplex.c ../lp_SOS.c ../lp_utils.c ../yacc_read.c' +c=$CC @@ -92,3 +114,18 @@ +fi + +rm *.o 2>/dev/null +--- misc/build/lp_solve_5.5/lpsolve55/ccc.ios.orig Sun May 22 11:19:48 2011 ++++ misc/build/lp_solve_5.5/lpsolve55/ccc.ios Sun May 22 11:19:48 2011 +@@ -1 +1,11 @@ +-dummy ++src='../lp_MDO.c ../shared/commonlib.c ../shared/mmio.c ../shared/myblas.c ../ini.c ../fortify.c ../colamd/colamd.c ../lp_rlp.c ../lp_crash.c ../bfp/bfp_LUSOL/lp_LUSOL.c ../bfp/bfp_LUSOL/LUSOL/lusol.c ../lp_Hash.c ../lp_lib.c ../lp_wlp.c ../lp_matrix.c ../lp_mipbb.c ../lp_MPS.c ../lp_params.c ../lp_presolve.c ../lp_price.c ../lp_pricePSE.c ../lp_report.c ../lp_scale.c ../lp_simplex.c ../lp_SOS.c ../lp_utils.c ../yacc_read.c' ++obj=`echo $src|sed -e 's/\.c/.o/g' -e 's!\([^ ]*/\)*!!g'` ++ ++opts='-O3' ++ ++def= ++ ++$CC -I.. -I../bfp -I../bfp/bfp_LUSOL -I../bfp/bfp_LUSOL/LUSOL -I../colamd -I../shared $opts $def -DYY_NEVER_INTERACTIVE -DPARSER_LP -DINVERSE_ACTIVE=INVERSE_LUSOL -DRoleIsExternalInvEngine -c $src ++ls -l ++ar -r liblpsolve55.a $obj ++rm $obj diff --git a/lpsolve/makefile.mk b/lpsolve/makefile.mk index 9eb0120..7e47591 100644 --- a/lpsolve/makefile.mk +++ b/lpsolve/makefile.mk @@ -39,17 +39,13 @@ TARGET=lpsolve TARFILE_NAME=lp_solve_5.5 TARFILE_MD5=26b3e95ddf3d9c077c480ea45874b3b8 -.IF "$(GUI)"=="WNT" +.IF "$(GUI_FOR_BUILD)"=="WNT" PATCH_FILES=lp_solve_5.5-windows.patch .ELSE PATCH_FILES=\ lp_solve_5.5.patch \ lp_solve-aix.patch -ADDITIONAL_FILES=lpsolve55$/ccc.solaris lpsolve55$/ccc.os2 -.ENDIF - -.IF "$(OS)"=="OPENBSD" -PATCH_FILES+=lp_solve_5.5-openbsd.patch +ADDITIONAL_FILES=lpsolve55$/ccc.solaris lpsolve55$/ccc.ios .ENDIF CONFIGURE_DIR= @@ -65,20 +61,26 @@ lpsolve_LDFLAGS=-shared-libgcc .IF "$(MINGW_SHARED_GXXLIB)"=="YES" lpsolve_LIBS=$(MINGW_SHARED_LIBSTDCPP) .ENDIF +.IF "$(GUI_FOR_BUILD)"=="WNT" BUILD_ACTION=lpsolve_LDFLAGS=$(lpsolve_LDFLAGS) lpsolve_LIBS=$(lpsolve_LIBS) cmd /c cgcc.bat .ELSE +BUILD_ACTION=sh ccc +OUT2LIB=$(BUILD_DIR)$/liblpsolve55.a +.ENDIF +.ELSE BUILD_ACTION=cmd /c cvc6.bat OUT2LIB=$(BUILD_DIR)$/lpsolve55.lib .ENDIF OUT2BIN=$(BUILD_DIR)$/lpsolve55.dll -.ELIF "$(GUI)"=="OS2" -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 +.ELIF "$(OS)"=="IOS" +.EXPORT: EXTRA_CDEFS EXTRA_LINKFLAGS +BUILD_ACTION=sh ccc.ios +OUT2LIB=$(BUILD_DIR)$/liblpsolve55.a .ELSE .IF "$(COMNAME)"=="sunpro5" BUILD_ACTION=sh ccc.solaris diff --git a/lpsolve/prj/d.lst b/lpsolve/prj/d.lst index 64b8c0c..68001dc 100644 --- a/lpsolve/prj/d.lst +++ b/lpsolve/prj/d.lst @@ -1,9 +1,10 @@ -mkdir: %_DEST%\inc%_EXT%\lpsolve +mkdir: %_DEST%\inc\lpsolve -..\%__SRC%\inc\lp_*.h %_DEST%\inc%_EXT%\lpsolve\* -..\%__SRC%\lib\liblpsolve55.so %_DEST%\lib%_EXT%\liblpsolve55.so -..\%__SRC%\lib\liblpsolve55.dylib %_DEST%\lib%_EXT%\liblpsolve55.dylib -..\%__SRC%\lib\liblpsolve55.lib %_DEST%\lib%_EXT%\liblpsolve55.lib -..\%__SRC%\lib\lpsolve55.lib %_DEST%\lib%_EXT%\lpsolve55.lib -..\%__SRC%\bin\lpsolve55.dll %_DEST%\bin%_EXT%\lpsolve55.dll +..\%__SRC%\inc\lp_*.h %_DEST%\inc\lpsolve\* +..\%__SRC%\lib\liblpsolve55.so %_DEST%\lib\liblpsolve55.so +..\%__SRC%\lib\liblpsolve55.dylib %_DEST%\lib\liblpsolve55.dylib +..\%__SRC%\lib\liblpsolve55.lib %_DEST%\lib\liblpsolve55.lib +..\%__SRC%\lib\liblpsolve55.a %_DEST%\lib\liblpsolve55.a +..\%__SRC%\lib\lpsolve55.lib %_DEST%\lib\lpsolve55.lib +..\%__SRC%\bin\lpsolve55.dll %_DEST%\bin\lpsolve55.dll diff --git a/lucene/prj/d.lst b/lucene/prj/d.lst index 553fc44..97c8968 100644 --- a/lucene/prj/d.lst +++ b/lucene/prj/d.lst @@ -1,3 +1,3 @@ -mkdir: %_DEST%\inc%_EXT%\external -mkdir: %_DEST%\inc%_EXT%\external\lucene -..\%__SRC%\bin\lucene-*.jar %_DEST%\bin%_EXT%\lucene-*.jar +mkdir: %_DEST%\inc\external +mkdir: %_DEST%\inc\external\lucene +..\%__SRC%\bin\lucene-*.jar %_DEST%\bin\lucene-*.jar diff --git a/mdds/prj/d.lst b/mdds/prj/d.lst index 9c4dd58..62d44f3 100644 --- a/mdds/prj/d.lst +++ b/mdds/prj/d.lst @@ -1,7 +1,7 @@ -mkdir: %_DEST%\inc%_EXT%\mdds -mkdir: %_DEST%\inc%_EXT%\mdds\hash_container +mkdir: %_DEST%\inc\mdds +mkdir: %_DEST%\inc\mdds\hash_container -..\%__SRC%\inc\mdds\* %_DEST%\inc%_EXT%\mdds -..\%__SRC%\inc\mdds\hash_container\* %_DEST%\inc%_EXT%\mdds\hash_container +..\%__SRC%\inc\mdds\* %_DEST%\inc\mdds +..\%__SRC%\inc\mdds\hash_container\* %_DEST%\inc\mdds\hash_container diff --git a/mysqlcppconn/prj/d.lst b/mysqlcppconn/prj/d.lst index 7a32571..5541358 100644 --- a/mysqlcppconn/prj/d.lst +++ b/mysqlcppconn/prj/d.lst @@ -1,15 +1,15 @@ # mirror the dir structure a make install would create -mkdir: %_DEST%\inc%_EXT%\mysqlcppconn -mkdir: %_DEST%\inc%_EXT%\mysqlcppconn\cppconn +mkdir: %_DEST%\inc\mysqlcppconn +mkdir: %_DEST%\inc\mysqlcppconn\cppconn -..\%__SRC%\inc\*.h %_DEST%\inc%_EXT%\mysqlcppconn\*.h -..\%__SRC%\inc\cppconn\*.h %_DEST%\inc%_EXT%\mysqlcppconn\cppconn\*.h +..\%__SRC%\inc\*.h %_DEST%\inc\mysqlcppconn\*.h +..\%__SRC%\inc\cppconn\*.h %_DEST%\inc\mysqlcppconn\cppconn\*.h -..\%__SRC%\bin\*.dll %_DEST%\bin%_EXT%\*.dll +..\%__SRC%\bin\*.dll %_DEST%\bin\*.dll - ..\%__SRC%\lib\lib*.so* %_DEST%\lib%_EXT% -..\%__SRC%\lib\*.sl %_DEST%\lib%_EXT%\*.sl -..\%__SRC%\lib\*.dylib %_DEST%\lib%_EXT%\*.dylib -..\%__SRC%\lib\*.dylib.* %_DEST%\lib%_EXT%\*.dylib.* -..\%__SRC%\lib\*.a %_DEST%\lib%_EXT%\*.a -..\%__SRC%\lib\i*.lib %_DEST%\lib%_EXT% + ..\%__SRC%\lib\lib*.so* %_DEST%\lib +..\%__SRC%\lib\*.sl %_DEST%\lib\*.sl +..\%__SRC%\lib\*.dylib %_DEST%\lib\*.dylib +..\%__SRC%\lib\*.dylib.* %_DEST%\lib\*.dylib.* +..\%__SRC%\lib\*.a %_DEST%\lib\*.a +..\%__SRC%\lib\i*.lib %_DEST%\lib diff --git a/mythes/makefile.mk b/mythes/makefile.mk index 131b1ee..abd7038 100644 --- a/mythes/makefile.mk +++ b/mythes/makefile.mk @@ -44,7 +44,8 @@ ADDITIONAL_FILES += makefile.mk PATCH_FILES=\ mythes-1.2.0-vanilla-th-gen-idx.patch \ mythes-1.2.0-makefile-mk.diff \ - mythes-1.2.1-rhbz675806.patch + mythes-1.2.1-rhbz675806.patch \ + mythes-1.2.0-android.patch .IF "$(GUI)"=="UNX" CONFIGURE_DIR=$(BUILD_DIR) @@ -80,6 +81,10 @@ CONFIGURE_FLAGS+=CPPFLAGS="$(EXTRA_CDEFS)" CONFIGURE_FLAGS+=CFLAGS='$(LCL_CONFIGURE_CFLAGS)' .ENDIF +.IF "$(CROSS_COMPILING)"=="YES" +CONFIGURE_FLAGS+=--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) gio_can_sniff=no +.ENDIF + BUILD_ACTION=make OUT2INC += mythes.hxx .ENDIF @@ -101,11 +106,6 @@ BUILD_ACTION=dmake OUT2INC += mythes.hxx .ENDIF # "$(GUI)"=="WNT" -.IF "$(GUI)"=="OS2" -BUILD_ACTION=dmake -OUT2INC += mythes.hxx -.ENDIF # "$(GUI)"=="OS2" - # --- Targets ------------------------------------------------------ .INCLUDE : set_ext.mk diff --git a/mythes/mythes-1.2.0-android.patch b/mythes/mythes-1.2.0-android.patch new file mode 100644 index 0000000..cb34b12 --- /dev/null +++ b/mythes/mythes-1.2.0-android.patch @@ -0,0 +1,11 @@ +--- misc/build/mythes-1.2.0/config.sub ++++ misc/build/mythes-1.2.0/config.sub +@@ -1272,7 +1272,7 @@ + | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \ + | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ + | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ +- | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ ++ | -udi* | -androideabi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ + | -chorusos* | -chorusrdb* | -cegcc* \ + | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ + | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \ diff --git a/mythes/prj/d.lst b/mythes/prj/d.lst index 417855e..375161f 100644 --- a/mythes/prj/d.lst +++ b/mythes/prj/d.lst @@ -1,7 +1,7 @@ -..\%__SRC%\slb\libmythes.lib %_DEST%\lib%_EXT%\libmythes.lib +..\%__SRC%\slb\libmythes.lib %_DEST%\lib\libmythes.lib -..\%__SRC%\inc\mythes.hxx %_DEST%\inc%_EXT%\mythes.hxx -..\%__SRC%\misc\build\mythes-1.2.0\.libs\libmythes-1.2.a %_DEST%\lib%_EXT%\libmythes-1.2.a -..\%__SRC%\lib\libmythes-1.2.a %_DEST%\lib%_EXT%\libmythes-1.2.a -..\%__SRC%\misc\build\mythes-1.2.0\th_gen_idx.pl %_DEST%\bin%_EXT%\th_gen_idx.pl +..\%__SRC%\inc\mythes.hxx %_DEST%\inc\mythes.hxx +..\%__SRC%\misc\build\mythes-1.2.0\.libs\libmythes-1.2.a %_DEST%\lib\libmythes-1.2.a +..\%__SRC%\lib\libmythes-1.2.a %_DEST%\lib\libmythes-1.2.a +..\%__SRC%\misc\build\mythes-1.2.0\th_gen_idx.pl %_DEST%\bin\th_gen_idx.pl diff --git a/np_sdk/mozsrc/jri_md.h b/np_sdk/mozsrc/jri_md.h index f02dcf0..6db8c65 100644 --- a/np_sdk/mozsrc/jri_md.h +++ b/np_sdk/mozsrc/jri_md.h @@ -68,25 +68,15 @@ extern "C" { /* DLL Entry modifiers... */ /* PC */ -#if defined(XP_OS2) -# ifdef XP_OS2_VACPP -# define JRI_PUBLIC_API(ResultType) ResultType _Optlink -# define JRI_PUBLIC_VAR(VarType) VarType -# define JRI_CALLBACK -# else -# define JRI_PUBLIC_API(ResultType) ResultType -# define JRI_PUBLIC_VAR(VarType) VarType -# define JRI_CALLBACK -# endif -#elif defined(XP_PC) || defined(_WINDOWS) || defined(WIN32) || defined(_WIN32) +#if defined(XP_PC) || defined(_WINDOWS) || defined(WIN32) || defined(_WIN32) # include <windows.h> # if defined(_MSC_VER) || defined(__MINGW32__) # if defined(WIN32) || defined(_WIN32) -# define JRI_PUBLIC_API(ResultType) _declspec(dllexport) ResultType +# define JRI_PUBLIC_API(ResultType) __declspec(dllexport) ResultType # define JRI_PUBLIC_VAR(VarType) VarType -# define JRI_PUBLIC_VAR_EXP(VarType) _declspec(dllexport) VarType -# define JRI_PUBLIC_VAR_IMP(VarType) _declspec(dllimport) VarType -# define JRI_NATIVE_STUB(ResultType) _declspec(dllexport) ResultType +# define JRI_PUBLIC_VAR_EXP(VarType) __declspec(dllexport) VarType +# define JRI_PUBLIC_VAR_IMP(VarType) __declspec(dllimport) VarType +# define JRI_NATIVE_STUB(ResultType) __declspec(dllexport) ResultType # define JRI_CALLBACK # else /* !_WIN32 */ # if defined(_WINDLL) diff --git a/np_sdk/mozsrc/makefile.mk b/np_sdk/mozsrc/makefile.mk index 905146a..248cb6d 100644 --- a/np_sdk/mozsrc/makefile.mk +++ b/np_sdk/mozsrc/makefile.mk @@ -35,12 +35,13 @@ EXTERNAL_WARNINGS_NOT_ERRORS := TRUE # --- Settings ----------------------------------------------------- .INCLUDE : settings.mk +.IF "$(OS)"!="IOS" && "$(OS)"!="ANDROID" .IF "$(L10N_framework)"=="" JDKINCS= # --- Files -------------------------------------------------------- -.IF "$(GUI)" == "WNT" || "$(GUI)" == "OS2" +.IF "$(GUI)" == "WNT" MOZFILES = $(SLO)$/npwin.obj .ELSE MOZFILES = $(SLO)$/npunix.obj @@ -54,6 +55,6 @@ ALL: $(MOZFILES) # --- Targets ------------------------------------------------------ .ENDIF # L10N_framework +.ENDIF # iOS or Android .INCLUDE : target.mk - diff --git a/np_sdk/mozsrc/npapi.h b/np_sdk/mozsrc/npapi.h index 4a14df5..c87d531 100644 --- a/np_sdk/mozsrc/npapi.h +++ b/np_sdk/mozsrc/npapi.h @@ -46,18 +46,8 @@ #define _NPAPI_H_ #define npapi_h_ -#ifdef __OS2__ -#pragma pack(1) -#endif - #include "jri.h" /* Java Runtime Interface */ -#if defined (__OS2__ ) || defined (OS2) -# ifndef XP_OS2 -# define XP_OS2 1 -# endif /* XP_OS2 */ -#endif /* __OS2__ */ - #ifdef _WINDOWS # ifndef XP_WIN # define XP_WIN 1 @@ -389,13 +379,6 @@ typedef struct _NPEvent uint32 wParam; uint32 lParam; } NPEvent; -#elif defined(XP_OS2) -typedef struct _NPEvent -{ - uint32 event; - uint32 wParam; - uint32 lParam; -} NPEvent; #elif defined (XP_UNIX) && !defined(NO_X11) typedef XEvent NPEvent; #else @@ -522,12 +505,8 @@ enum NPEventType { #if defined(_WINDOWS) && !defined(WIN32) #define NP_LOADDS _loadds #else -#if defined(__OS2__) -#define NP_LOADDS _System -#else #define NP_LOADDS #endif -#endif #ifdef __cplusplus extern "C" { @@ -604,8 +583,5 @@ void NP_LOADDS NPN_ForceRedraw(NPP instance); #endif #endif /* RC_INVOKED */ -#ifdef __OS2__ -#pragma pack() -#endif #endif /* _NPAPI_H_ */ diff --git a/np_sdk/mozsrc/npupp.h b/np_sdk/mozsrc/npupp.h index 9cf63e1..b2f9576 100644 --- a/np_sdk/mozsrc/npupp.h +++ b/np_sdk/mozsrc/npupp.h @@ -46,10 +46,6 @@ #ifndef _NPUPP_H_ #define _NPUPP_H_ -#if defined(__OS2__) -#pragma pack(1) -#endif - #ifndef GENERATINGCFM #define GENERATINGCFM 0 #endif @@ -1223,35 +1219,16 @@ typedef OSErr (* NP_LOADDS BP_GetSupportedMIMETypesUPP)(BPSupportedMIMETypes*, U #if defined(_WINDOWS) #define OSCALL WINAPI #else -#if defined(__OS2__) -#define OSCALL _System -#else #define OSCALL #endif -#endif -#if defined( _WINDOWS ) || defined (__OS2__) +#if defined( _WINDOWS ) #ifdef __cplusplus extern "C" { #endif /* plugin meta member functions */ -#if defined(__OS2__) - -typedef struct _NPPluginData { /* Alternate OS2 Plugin interface */ - char *pMimeTypes; - char *pFileExtents; - char *pFileOpenTemplate; - char *pProductName; - char *pProductDescription; - unsigned long dwProductVersionMS; - unsigned long dwProductVersionLS; -} NPPluginData; - -NPError OSCALL NP_GetPluginData(NPPluginData * pPluginData); - -#endif NPError OSCALL NP_GetEntryPoints(NPPluginFuncs* pFuncs); @@ -1265,11 +1242,7 @@ char* NP_GetMIMEDescription(); } #endif -#endif /* _WINDOWS || __OS2__ */ - -#if defined(__OS2__) -#pragma pack() -#endif +#endif /* _WINDOWS */ #ifdef XP_UNIX diff --git a/np_sdk/mozsrc/npwin.cpp b/np_sdk/mozsrc/npwin.cpp index 1fb4d3e..3c893b2 100644 --- a/np_sdk/mozsrc/npwin.cpp +++ b/np_sdk/mozsrc/npwin.cpp @@ -45,12 +45,6 @@ //\\// 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; diff --git a/np_sdk/prj/d.lst b/np_sdk/prj/d.lst index eaad1f5..cfd2429 100644 --- a/np_sdk/prj/d.lst +++ b/np_sdk/prj/d.lst @@ -1,7 +1,7 @@ -mkdir: %_DEST%\inc%_EXT%\npsdk +mkdir: %_DEST%\inc\npsdk -..\mozsrc\*.h %_DEST%\inc%_EXT%\npsdk\*.h +..\mozsrc\*.h %_DEST%\inc\npsdk\*.h -..\%__SRC%\slo\npunix.o %_DEST%\lib%_EXT%\npunix.o -..\%__SRC%\slo\npunix.obj %_DEST%\lib%_EXT%\npunix.obj -..\%__SRC%\slo\npwin.obj %_DEST%\lib%_EXT%\npwin.obj +..\%__SRC%\slo\npunix.o %_DEST%\lib\npunix.o +..\%__SRC%\slo\npunix.obj %_DEST%\lib\npunix.obj +..\%__SRC%\slo\npwin.obj %_DEST%\lib\npwin.obj diff --git a/openssl/makefile.mk b/openssl/makefile.mk index aff765f..1b789b3 100644 --- a/openssl/makefile.mk +++ b/openssl/makefile.mk @@ -64,7 +64,7 @@ OUT2INC += include/openssl/* UNAME=$(shell uname) -.IF "$(OS)" == "LINUX" || "$(OS)" == "FREEBSD" +.IF "$(OS)" == "LINUX" || "$(OS)" == "FREEBSD" || "$(OS)" == "ANDROID" PATCH_FILES=openssllnx.patch ADDITIONAL_FILES:= \ libcrypto_OOo_0_9_8o.map \ @@ -110,6 +110,12 @@ UNAME=$(shell uname) .ENDIF .ENDIF +.IF "$(OS)" == "IOS" + PATCH_FILES=opensslios.patch + CONFIGURE_ACTION=Configure ios-armv7 + CONFIGURE_FLAGS=no-shared no-idea +.ENDIF + .IF "$(OS)" == "WNT" .IF "$(COM)"=="GCC" diff --git a/openssl/opensslios.patch b/openssl/opensslios.patch new file mode 100644 index 0000000..48166e8 --- /dev/null +++ b/openssl/opensslios.patch @@ -0,0 +1,12 @@ +--- misc/openssl-0.9.8o/Configure ++++ misc/build/openssl-0.9.8o/Configure +@@ -530,6 +530,9 @@ + "darwin64-x86_64-cc","cc:-arch x86_64 -O3 -fomit-frame-pointer -DL_ENDIAN -DMD32_REG_T=int -Wall::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL:${no_asm}:dlfcn:darwin-shared:-fPIC -fno-common:-arch x86_64 -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib", + "debug-darwin-ppc-cc","cc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DCRYPTO_MDEBUG -DB_ENDIAN -g -Wall -O::-D_REENTRANT:MACOSX::BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR::osx_ppc32.o::::::::::dlfcn:darwin-shared:-fPIC -fno-common:-dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib", + ++##### iOS ++"ios-armv7","gcc:-arch armv7 -O3 -fomit-frame-pointer -DL_ENDIAN:::IOS::BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${no_asm}:::::", ++ + ##### A/UX + "aux3-gcc","gcc:-O2 -DTERMIO::(unknown):AUX:-lbsd:RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:::", + diff --git a/openssl/prj/d.lst b/openssl/prj/d.lst index 7206585..109bbaa 100644 --- a/openssl/prj/d.lst +++ b/openssl/prj/d.lst @@ -1,11 +1,11 @@ -mkdir: %_DEST%\inc%_EXT%\external -mkdir: %_DEST%\inc%_EXT%\external\openssl -..\version.mk %_DEST%\inc%_EXT%\external\openssl\version.mk -..\%__SRC%\inc\*.h %_DEST%\inc%_EXT%\external\openssl -..\%__SRC%\lib\ssleay32.lib %_DEST%\lib%_EXT%\ssleay32.lib -..\%__SRC%\bin\ssleay32.dll %_DEST%\bin%_EXT%\ssleay32.dll -..\%__SRC%\lib\libeay32.lib %_DEST%\lib%_EXT%\libeay32.lib -..\%__SRC%\bin\libeay32.dll %_DEST%\bin%_EXT%\libeay32.dll -..\%__SRC%\lib\libcrypto.a %_DEST%\lib%_EXT%\libcrypto.a -..\%__SRC%\lib\libssl.a %_DEST%\lib%_EXT%\libssl.a +mkdir: %_DEST%\inc\external +mkdir: %_DEST%\inc\external\openssl +..\version.mk %_DEST%\inc\external\openssl\version.mk +..\%__SRC%\inc\*.h %_DEST%\inc\external\openssl +..\%__SRC%\lib\ssleay32.lib %_DEST%\lib\ssleay32.lib +..\%__SRC%\bin\ssleay32.dll %_DEST%\bin\ssleay32.dll +..\%__SRC%\lib\libeay32.lib %_DEST%\lib\libeay32.lib +..\%__SRC%\bin\libeay32.dll %_DEST%\bin\libeay32.dll +..\%__SRC%\lib\libcrypto.a %_DEST%\lib\libcrypto.a +..\%__SRC%\lib\libssl.a %_DEST%\lib\libssl.a diff --git a/redland/prj/d.lst b/redland/prj/d.lst index f96f3a5..20bae4d 100644 --- a/redland/prj/d.lst +++ b/redland/prj/d.lst @@ -1,19 +1,19 @@ -mkdir: %_DEST%\inc%_EXT%\external -..\%__SRC%\inc\*.h %_DEST%\inc%_EXT%\external\*.h -..\%__SRC%\lib\libraptor.so.1 %_DEST%\lib%_EXT%\libraptor.so.1 -symlink: %_DEST%\lib%_EXT%\libraptor.so.1 %_DEST%\lib%_EXT%\libraptor.so -..\%__SRC%\lib\libraptor.1.dylib %_DEST%\lib%_EXT%\libraptor.1.dylib -symlink: %_DEST%\lib%_EXT%\libraptor.1.dylib %_DEST%\lib%_EXT%\libraptor.dylib -..\%__SRC%\lib\librasqal.so.1 %_DEST%\lib%_EXT%\librasqal.so.1 -symlink: %_DEST%\lib%_EXT%\librasqal.so.1 %_DEST%\lib%_EXT%\librasqal.so -..\%__SRC%\lib\librasqal.1.dylib %_DEST%\lib%_EXT%\librasqal.1.dylib -symlink: %_DEST%\lib%_EXT%\librasqal.1.dylib %_DEST%\lib%_EXT%\librasqal.dylib -..\%__SRC%\lib\librdf.so.0 %_DEST%\lib%_EXT%\librdf.so.0 -symlink: %_DEST%\lib%_EXT%\librdf.so.0 %_DEST%\lib%_EXT%\librdf.so -..\%__SRC%\lib\librdf.0.dylib %_DEST%\lib%_EXT%\librdf.0.dylib -symlink: %_DEST%\lib%_EXT%\librdf.0.dylib %_DEST%\lib%_EXT%\librdf.dylib -..\%__SRC%\lib\*.lib %_DEST%\lib%_EXT% -..\%__SRC%\lib\*.a %_DEST%\lib%_EXT% -..\%__SRC%\lib\lib*.dll.a %_DEST%\lib%_EXT%\lib*.a -..\%__SRC%\bin\*.dll %_DEST%\bin%_EXT% -..\redlandversion.mk %_DEST%\inc%_EXT%\redlandversion.mk +mkdir: %_DEST%\inc\external +..\%__SRC%\inc\*.h %_DEST%\inc\external\*.h +..\%__SRC%\lib\libraptor.so.1 %_DEST%\lib\libraptor.so.1 +symlink: %_DEST%\lib\libraptor.so.1 %_DEST%\lib\libraptor.so +..\%__SRC%\lib\libraptor.1.dylib %_DEST%\lib\libraptor.1.dylib +symlink: %_DEST%\lib\libraptor.1.dylib %_DEST%\lib\libraptor.dylib +..\%__SRC%\lib\librasqal.so.1 %_DEST%\lib\librasqal.so.1 +symlink: %_DEST%\lib\librasqal.so.1 %_DEST%\lib\librasqal.so +..\%__SRC%\lib\librasqal.1.dylib %_DEST%\lib\librasqal.1.dylib +symlink: %_DEST%\lib\librasqal.1.dylib %_DEST%\lib\librasqal.dylib +..\%__SRC%\lib\librdf.so.0 %_DEST%\lib\librdf.so.0 +symlink: %_DEST%\lib\librdf.so.0 %_DEST%\lib\librdf.so +..\%__SRC%\lib\librdf.0.dylib %_DEST%\lib\librdf.0.dylib +symlink: %_DEST%\lib\librdf.0.dylib %_DEST%\lib\librdf.dylib +..\%__SRC%\lib\*.lib %_DEST%\lib +..\%__SRC%\lib\*.a %_DEST%\lib +..\%__SRC%\lib\lib*.dll.a %_DEST%\lib\lib*.a +..\%__SRC%\bin\*.dll %_DEST%\bin +..\redlandversion.mk %_DEST%\inc\redlandversion.mk diff --git a/redland/raptor/makefile.mk b/redland/raptor/makefile.mk index bbedd36..50cc9ee 100644 --- a/redland/raptor/makefile.mk +++ b/redland/raptor/makefile.mk @@ -36,8 +36,8 @@ TARGET=so_raptor .IF "$(SYSTEM_REDLAND)" == "YES" all: - @echo "An already available installation of Redland RDF should exist on your system." - @echo "Therefore the version provided here does not need to be built in addition." + @echo "An already available installation of Redland RDF should exist on your system." + @echo "Therefore the version provided here does not need to be built in addition." .ENDIF # --- Files -------------------------------------------------------- @@ -59,13 +59,21 @@ OOO_PATCH_FILES= \ $(TARFILE_NAME).patch.win32 \ raptor-aix.patch +.IF "$(CROSS_COMPILING)"=="YES" +OOO_PATCH_FILES += \ + $(TARFILE_NAME).patch.cross +.ENDIF + PATCH_FILES=$(OOO_PATCH_FILES) +.IF "$(SYSTEM_LIBXML)" == "YES" +PATCH_FILES+=raptor-1.4.18.libxml.patch +.ENDIF +.IF "$(SYSTEM_LIBXSLT)" == "YES" +PATCH_FILES+=raptor-1.4.18.libxslt.patch +.ENDIF -.IF "$(OS)"=="OS2" -BUILD_ACTION=dmake -BUILD_DIR=$(CONFIGURE_DIR)$/src -.ELIF "$(OS)"=="WNT" +.IF "$(OS)"=="WNT" .IF "$(COM)"=="GCC" OOO_PATCH_FILES+=$(TARFILE_NAME).patch.mingw raptor_CC=$(CC) -mthreads @@ -130,8 +138,16 @@ XSLTLIB!:=$(XSLTLIB) # expand dmake variables for xslt-config CONFIGURE_DIR= CONFIGURE_ACTION=.$/configure +.IF "$(OS)"=="IOS" +CONFIGURE_FLAGS=--disable-shared +.ELSE +CONFIGURE_FLAGS=--disable-static +.ENDIF # do not enable grddl parser (#i93768#) -CONFIGURE_FLAGS=--disable-static --disable-gtk-doc --with-threads --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 +CONFIGURE_FLAGS+= --disable-gtk-doc --with-threads --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 +.IF "$(CROSS_COMPILING)"=="YES" +CONFIGURE_FLAGS+= --build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) +.ENDIF BUILD_ACTION=$(GNUMAKE) BUILD_FLAGS+= -j$(EXTMAXPROCESS) BUILD_DIR=$(CONFIGURE_DIR) @@ -143,6 +159,9 @@ OUT2INC+=src$/raptor.h .IF "$(OS)"=="MACOSX" OUT2LIB+=src$/.libs$/libraptor.$(RAPTOR_MAJOR).dylib src$/.libs$/libraptor.dylib OUT2BIN+=src/raptor-config +.ELIF "$(OS)"=="IOS" || "$(OS)"=="ANDROID" +OUT2LIB+=src$/.libs$/libraptor.a +OUT2BIN+=src/raptor-config .ELIF "$(OS)"=="AIX" OUT2LIB+=src$/.libs$/libraptor.so.$(RAPTOR_MAJOR) src$/.libs$/libraptor.so OUT2BIN+=src/raptor-config @@ -154,8 +173,6 @@ OUT2BIN+=src/raptor-config .ELSE # if we use dmake, this is done automagically .ENDIF -.ELIF "$(GUI)"=="OS2" -# if we use dmake, this is done automagically .ELSE OUT2LIB+=src$/.libs$/libraptor.so.$(RAPTOR_MAJOR) src$/.libs$/libraptor.so OUT2BIN+=src/raptor-config diff --git a/redland/raptor/raptor-1.4.18.libxml.patch b/redland/raptor/raptor-1.4.18.libxml.patch new file mode 100644 index 0000000..59e5ceb --- /dev/null +++ b/redland/raptor/raptor-1.4.18.libxml.patch @@ -0,0 +1,117 @@ +--- misc/raptor-1.4.18/configure 2011-06-05 11:55:18.000000000 -0400 ++++ misc/build/raptor-1.4.18/configure 2011-06-05 11:55:46.000000000 -0400 +@@ -23470,73 +23470,6 @@ + LIBS="$oLIBS" + + +-# Check whether --with-xml2-config was given. +-if test "${with_xml2_config+set}" = set; then +- withval=$with_xml2_config; xml2_config="$withval" +-else +- xml2_config="" +-fi +- +- +-if test "X$xml2_config" != "X" ; then +- { echo "$as_me:$LINENO: checking for $xml2_config" >&5 +-echo $ECHO_N "checking for $xml2_config... $ECHO_C" >&6; } +- +- if test -f $xml2_config ; then +- XML_CONFIG=$xml2_config +- { echo "$as_me:$LINENO: result: yes" >&5 +-echo "${ECHO_T}yes" >&6; } +- else +- { echo "$as_me:$LINENO: result: no - searching PATH" >&5 +-echo "${ECHO_T}no - searching PATH" >&6; } +- fi +-fi +-if test "X$XML_CONFIG" = "X"; then +- for ac_prog in xml2-config +-do +- # Extract the first word of "$ac_prog", so it can be a program name with args. +-set dummy $ac_prog; ac_word=$2 +-{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +-if test "${ac_cv_prog_XML_CONFIG+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- if test -n "$XML_CONFIG"; then +- ac_cv_prog_XML_CONFIG="$XML_CONFIG" # Let the user override the test. +-else +-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +-for as_dir in $PATH +-do +- IFS=$as_save_IFS +- test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then +- ac_cv_prog_XML_CONFIG="$ac_prog" +- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 +- break 2 +- fi +-done +-done +-IFS=$as_save_IFS +- +-fi +-fi +-XML_CONFIG=$ac_cv_prog_XML_CONFIG +-if test -n "$XML_CONFIG"; then +- { echo "$as_me:$LINENO: result: $XML_CONFIG" >&5 +-echo "${ECHO_T}$XML_CONFIG" >&6; } +-else +- { echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6; } +-fi +- +- +- test -n "$XML_CONFIG" && break +-done +- +-fi +- +- + # Check whether --with-xslt-config was given. + if test "${with_xslt_config+set}" = set; then + withval=$with_xslt_config; xslt_config="$withval" +@@ -23719,8 +23652,8 @@ + + oCPPFLAGS="$CPPFLAGS" + oLIBS="$LIBS" +-if test "X$XML_CONFIG" != X; then +- LIBS="$LIBS `$XML_CONFIG --libs`" ++if test 0; then ++ LIBS="$LIBS $LIBXML_LIBS" + { echo "$as_me:$LINENO: checking for xmlCreatePushParserCtxt" >&5 + echo $ECHO_N "checking for xmlCreatePushParserCtxt... $ECHO_C" >&6; } + if test "${ac_cv_func_xmlCreatePushParserCtxt+set}" = set; then +@@ -23813,18 +23746,6 @@ + if test $have_xmlCreatePushParserCtxt = yes; then + have_libxml_lib=1 + have_libxml=1 +- CPPFLAGS="`$XML_CONFIG --cflags` $CPPFLAGS" +- LIBXML_VERSION=`$XML_CONFIG --version` +- libxml_version_dec=`echo $LIBXML_VERSION | awk -F. '{printf("%d\n", 10000*$1 + 100*$2 + $3)};'` +- libxml_min_version_dec=`echo $libxml_min_version | awk -F. '{printf("%d\n", 10000*$1 + 100*$2 + $3)};'` +- { echo "$as_me:$LINENO: result: yes - version $LIBXML_VERSION" >&5 +-echo "${ECHO_T}yes - version $LIBXML_VERSION" >&6; } +- if test $libxml_version_dec -lt $libxml_min_version_dec; then +- { echo "$as_me:$LINENO: WARNING: Using libxml $LIBXML_VERSION is unsupported - $libxml_min_version or newer required." >&5 +-echo "$as_me: WARNING: Using libxml $LIBXML_VERSION is unsupported - $libxml_min_version or newer required." >&2;} +- have_libxml_lib=0 +- have_libxml=0 +- fi + else + { echo "$as_me:$LINENO: result: no" >&5 + echo "${ECHO_T}no" >&6; } +@@ -26447,8 +26368,8 @@ + CPPFLAGS="-I$srcdir/libxml $CPPFLAGS" + LIBS="$LIBS -Llibxml -llibxml" + else +- LIBS="$LIBS `$XML_CONFIG --libs`" +- CPPFLAGS="`$XML_CONFIG --cflags` $CPPFLAGS" ++ LIBS="$LIBS $LIBXML_LIBS" ++ CPPFLAGS="$LIBXML_CFLAGS $CPPFLAGS" + fi + RAPTOR_XML_PARSER=libxml + fi diff --git a/redland/raptor/raptor-1.4.18.libxslt.patch b/redland/raptor/raptor-1.4.18.libxslt.patch new file mode 100644 index 0000000..6dfffd9 --- /dev/null +++ b/redland/raptor/raptor-1.4.18.libxslt.patch @@ -0,0 +1,116 @@ +--- misc/raptor-1.4.18/configure 2011-06-05 11:57:41.000000000 -0400 ++++ misc/build/raptor-1.4.18/configure 2011-06-05 11:58:11.000000000 -0400 +@@ -23470,73 +23470,6 @@ + LIBS="$oLIBS" + + +-# Check whether --with-xslt-config was given. +-if test "${with_xslt_config+set}" = set; then +- withval=$with_xslt_config; xslt_config="$withval" +-else +- xslt_config="" +-fi +- +- +-if test "X$xslt_config" != "X" ; then +- { echo "$as_me:$LINENO: checking for $xslt_config" >&5 +-echo $ECHO_N "checking for $xslt_config... $ECHO_C" >&6; } +- +- if test -f $xslt_config ; then +- XSLT_CONFIG=$xslt_config +- { echo "$as_me:$LINENO: result: yes" >&5 +-echo "${ECHO_T}yes" >&6; } +- else +- { echo "$as_me:$LINENO: result: no - searching PATH" >&5 +-echo "${ECHO_T}no - searching PATH" >&6; } +- fi +-fi +-if test "X$XSLT_CONFIG" = "X"; then +- for ac_prog in xslt-config +-do +- # Extract the first word of "$ac_prog", so it can be a program name with args. +-set dummy $ac_prog; ac_word=$2 +-{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +-if test "${ac_cv_prog_XSLT_CONFIG+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- if test -n "$XSLT_CONFIG"; then +- ac_cv_prog_XSLT_CONFIG="$XSLT_CONFIG" # Let the user override the test. +-else +-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +-for as_dir in $PATH +-do +- IFS=$as_save_IFS +- test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then +- ac_cv_prog_XSLT_CONFIG="$ac_prog" +- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 +- break 2 +- fi +-done +-done +-IFS=$as_save_IFS +- +-fi +-fi +-XSLT_CONFIG=$ac_cv_prog_XSLT_CONFIG +-if test -n "$XSLT_CONFIG"; then +- { echo "$as_me:$LINENO: result: $XSLT_CONFIG" >&5 +-echo "${ECHO_T}$XSLT_CONFIG" >&6; } +-else +- { echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6; } +-fi +- +- +- test -n "$XSLT_CONFIG" && break +-done +- +-fi +- +- + # Check whether --with-curl-config was given. + if test "${with_curl_config+set}" = set; then + withval=$with_curl_config; curl_config="$withval" +@@ -24702,8 +24635,8 @@ + + oCPPFLAGS="$CPPFLAGS" + oLIBS="$LIBS" +-if test "X$XSLT_CONFIG" != X; then +- LIBS="$LIBS `$XSLT_CONFIG --libs`" ++if test 0; then ++ LIBS="$LIBS $LIBXSLT_LIBS" + { echo "$as_me:$LINENO: checking for xsltSaveResultToString" >&5 + echo $ECHO_N "checking for xsltSaveResultToString... $ECHO_C" >&6; } + if test "${ac_cv_func_xsltSaveResultToString+set}" = set; then +@@ -24795,17 +24728,6 @@ + echo $ECHO_N "checking for system libxslt library... $ECHO_C" >&6; } + if test $have_xsltSaveResultToString = yes; then + have_libxslt=1 +- CPPFLAGS="`$XSLT_CONFIG --cflags` $CPPFLAGS" +- LIBXSLT_VERSION=`$XSLT_CONFIG --version` +- libxslt_version_dec=`echo $LIBXSLT_VERSION | awk -F. '{printf("%d\n", 10000*$1 + 100*$2 + $3)};'` +- libxslt_min_version_dec=`echo $libxslt_min_version | awk -F. '{printf("%d\n", 10000*$1 + 100*$2 + $3)};'` +- { echo "$as_me:$LINENO: result: yes - version $LIBXSLT_VERSION" >&5 +-echo "${ECHO_T}yes - version $LIBXSLT_VERSION" >&6; } +- if test $libxslt_version_dec -lt $libxslt_min_version_dec; then +- { echo "$as_me:$LINENO: WARNING: Using libxslt $LIBXSLT_VERSION is unsupported - $libxslt_min_version or newer required." >&5 +-echo "$as_me: WARNING: Using libxslt $LIBXSLT_VERSION is unsupported - $libxslt_min_version or newer required." >&2;} +- have_libxslt=0 +- fi + else + { echo "$as_me:$LINENO: result: no" >&5 + echo "${ECHO_T}no" >&6; } +@@ -26395,8 +26317,8 @@ + fi + + if test $need_libxslt = 1; then +- LIBS="$LIBS `$XSLT_CONFIG --libs`" +- CPPFLAGS="`$XSLT_CONFIG --cflags` $CPPFLAGS" ++ LIBS="$LIBS $LIBXSLT_LIBS" ++ CPPFLAGS="$LIBXSLT_CFLAGS $CPPFLAGS" + fi + + RAPTOR_LIBTOOLLIBS=libraptor.la diff --git a/redland/raptor/raptor-1.4.18.patch.autotools b/redland/raptor/raptor-1.4.18.patch.autotools index 4b43def..ed9e6bd 100644 --- a/redland/raptor/raptor-1.4.18.patch.autotools +++ b/redland/raptor/raptor-1.4.18.patch.autotools @@ -1,3 +1,14 @@ +--- misc/raptor-1.4.18/config.sub ++++ misc/build/raptor-1.4.18/config.sub +@@ -1272,7 +1272,7 @@ + | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \ + | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ + | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ +- | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ ++ | -udi* | -androideabi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ + | -chorusos* | -chorusrdb* \ + | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ + | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \ --- misc/raptor-1.4.18/configure Sun Jun 15 10:25:55 2008 +++ misc/build/raptor-1.4.18/configure Wed Feb 18 13:23:12 2009 @@ -4321,7 +4321,7 @@ diff --git a/redland/raptor/raptor-1.4.18.patch.cross b/redland/raptor/raptor-1.4.18.patch.cross new file mode 100644 index 0000000..bf4c432 --- /dev/null +++ b/redland/raptor/raptor-1.4.18.patch.cross @@ -0,0 +1,35 @@ +--- misc/raptor-1.4.18/configure ++++ misc/build/raptor-1.4.18/configure +@@ -22643,11 +22643,13 @@ + { echo "$as_me:$LINENO: checking vsnprintf has C99 compatible return value" >&5 + echo $ECHO_N "checking vsnprintf has C99 compatible return value... $ECHO_C" >&6; } + if test "$cross_compiling" = yes; then +- { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling +-See \`config.log' for more details." >&5 +-echo "$as_me: error: cannot run test program while cross compiling +-See \`config.log' for more details." >&2;} +- { (exit 1); exit 1; }; } ++ ++cat >>confdefs.h <<\_ACEOF ++#define HAVE_C99_VSNPRINTF 1 ++_ACEOF ++ ++ { echo "$as_me:$LINENO: result: guessing yes" >&5 ++echo "${ECHO_T}guessing yes" >&6; } + else + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ +@@ -23367,11 +23369,8 @@ + { echo "$as_me:$LINENO: checking for expat support of UTF-8 BOM" >&5 + echo $ECHO_N "checking for expat support of UTF-8 BOM... $ECHO_C" >&6; } + if test "$cross_compiling" = yes; then +- { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling +-See \`config.log' for more details." >&5 +-echo "$as_me: error: cannot run test program while cross compiling +-See \`config.log' for more details." >&2;} +- { (exit 1); exit 1; }; } ++ { echo "$as_me:$LINENO: result: guessing yes" >&5 ++echo "${ECHO_T}guessing yes" >&6; } + else + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ diff --git a/redland/rasqal/makefile.mk b/redland/rasqal/makefile.mk index a4c2187..ce3a6cf 100644 --- a/redland/rasqal/makefile.mk +++ b/redland/rasqal/makefile.mk @@ -62,10 +62,7 @@ OOO_PATCH_FILES= \ PATCH_FILES=$(OOO_PATCH_FILES) -.IF "$(OS)"=="OS2" -BUILD_ACTION=dmake -BUILD_DIR=$(CONFIGURE_DIR)$/src -.ELIF "$(OS)"=="WNT" +.IF "$(OS)"=="WNT" .IF "$(COM)"=="GCC" rasqal_CC=$(CC) -mthreads .IF "$(MINGW_SHARED_GCCLIB)"=="YES" @@ -127,7 +124,15 @@ XSLTLIB!:=$(XSLTLIB) # expand dmake variables for xslt-config CONFIGURE_DIR= CONFIGURE_ACTION=.$/configure PATH="..$/..$/..$/bin:$$PATH" -CONFIGURE_FLAGS=--disable-static --disable-gtk-doc --with-threads --with-openssl-digests --with-xml-parser=libxml --without-bdb --without-sqlite --without-mysql --without-postgresql --without-threestore --with-regex-library=posix --with-decimal=none --with-www=xml +.IF "$(OS)"=="IOS" +CONFIGURE_FLAGS=--disable-shared +.ELSE +CONFIGURE_FLAGS=--disable-static +.ENDIF +CONFIGURE_FLAGS+= --disable-gtk-doc --with-threads --with-openssl-digests --with-xml-parser=libxml --without-bdb --without-sqlite --without-mysql --without-postgresql --without-threestore --with-regex-library=posix --with-decimal=none --with-www=xml +.IF "$(CROSS_COMPILING)"=="YES" +CONFIGURE_FLAGS+= --build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) +.ENDIF BUILD_ACTION=$(AUGMENT_LIBRARY_PATH) $(GNUMAKE) BUILD_FLAGS+= -j$(EXTMAXPROCESS) BUILD_DIR=$(CONFIGURE_DIR) @@ -139,6 +144,9 @@ OUT2INC+=src$/rasqal.h .IF "$(OS)"=="MACOSX" OUT2LIB+=src$/.libs$/librasqal.$(RASQAL_MAJOR).dylib src$/.libs$/librasqal.dylib OUT2BIN+=src/rasqal-config +.ELIF "$(OS)"=="IOS" || "$(OS)"=="ANDROID" +OUT2LIB+=src$/.libs$/librasqal.a +OUT2BIN+=src/rasqal-config .ELIF "$(OS)"=="WNT" .IF "$(COM)"=="GCC" OUT2LIB+=src$/.libs$/*.a @@ -147,8 +155,6 @@ OUT2BIN+=src/rasqal-config .ELSE # if we use dmake, this is done automagically .ENDIF -.ELIF "$(OS)"=="OS2" -# if we use dmake, this is done automagically .ELSE OUT2LIB+=src$/.libs$/librasqal.so.$(RASQAL_MAJOR) src$/.libs$/librasqal.so OUT2BIN+=src/rasqal-config diff --git a/redland/rasqal/rasqal-0.9.16.patch.autotools b/redland/rasqal/rasqal-0.9.16.patch.autotools index 100499d..19b8792 100644 --- a/redland/rasqal/rasqal-0.9.16.patch.autotools +++ b/redland/rasqal/rasqal-0.9.16.patch.autotools @@ -1,3 +1,14 @@ +--- misc/rasqal-0.9.16/config.sub ++++ misc/build/rasqal-0.9.16/config.sub +@@ -1272,7 +1272,7 @@ + | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \ + | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ + | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ +- | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ ++ | -udi* | -androideabi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ + | -chorusos* | -chorusrdb* | -cegcc* \ + | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ + | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \ --- misc/rasqal-0.9.16/ltmain.sh Tue Apr 29 23:33:55 2008 +++ misc/build/rasqal-0.9.16/ltmain.sh Wed Feb 18 13:25:00 2009 @@ -1565,6 +1565,11 @@ diff --git a/redland/redland/makefile.mk b/redland/redland/makefile.mk index c8a04dc..4bed69e 100644 --- a/redland/redland/makefile.mk +++ b/redland/redland/makefile.mk @@ -62,10 +62,7 @@ OOO_PATCH_FILES= \ PATCH_FILES=$(OOO_PATCH_FILES) \ -.IF "$(OS)"=="OS2" -BUILD_ACTION=dmake -BUILD_DIR=$(CONFIGURE_DIR)$/librdf -.ELIF "$(OS)"=="WNT" +.IF "$(OS)"=="WNT" .IF "$(COM)"=="GCC" redland_CC=$(CC) -mthreads .IF "$(MINGW_SHARED_GCCLIB)"=="YES" @@ -131,7 +128,15 @@ XSLTLIB!:=$(XSLTLIB) # expand dmake variables for xslt-config CONFIGURE_DIR= CONFIGURE_ACTION=.$/configure PATH="..$/..$/..$/bin:$$PATH" -CONFIGURE_FLAGS=--disable-static --disable-gtk-doc --with-threads --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 +.IF "$(OS)"=="IOS" +CONFIGURE_FLAGS=--disable-shared +.ELSE +CONFIGURE_FLAGS=--disable-static +.ENDIF +CONFIGURE_FLAGS+= --disable-gtk-doc --with-threads --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 +.IF "$(CROSS_COMPILING)"=="YES" +CONFIGURE_FLAGS+= --build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) +.ENDIF BUILD_ACTION=$(AUGMENT_LIBRARY_PATH) $(GNUMAKE) BUILD_FLAGS+= -j$(EXTMAXPROCESS) BUILD_DIR=$(CONFIGURE_DIR) @@ -142,6 +147,8 @@ OUT2INC+=librdf$/*.h .IF "$(OS)"=="MACOSX" OUT2LIB+=librdf$/.libs$/librdf.$(REDLAND_MAJOR).dylib +.ELIF "$(OS)"=="IOS" || "$(OS)"=="ANDROID" +OUT2LIB+=librdf$/.libs$/librdf.a .ELIF "$(OS)"=="WNT" .IF "$(COM)"=="GCC" OUT2LIB+=librdf$/.libs$/*.a @@ -149,8 +156,6 @@ OUT2BIN+=librdf$/.libs$/*.dll .ELSE # if we use dmake, this is done automagically .ENDIF -.ELIF "$(OS)"=="OS2" -# if we use dmake, this is done automagically .ELSE OUT2LIB+=librdf$/.libs$/librdf.so.$(REDLAND_MAJOR) .ENDIF diff --git a/redland/redland/redland-1.0.8.patch.autotools b/redland/redland/redland-1.0.8.patch.autotools index 5b29d0b..2bd2085 100644 --- a/redland/redland/redland-1.0.8.patch.autotools +++ b/redland/redland/redland-1.0.8.patch.autotools @@ -1,3 +1,14 @@ +--- misc/redland-1.0.8/config.sub ++++ misc/build/redland-1.0.8/config.sub +@@ -1272,7 +1272,7 @@ + | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \ + | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ + | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ +- | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ ++ | -udi* | -androideabi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ + | -chorusos* | -chorusrdb* | -cegcc* \ + | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ + | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \ --- misc/redland-1.0.8/configure Fri Jul 4 18:00:39 2008 +++ misc/build/redland-1.0.8/configure Wed Feb 18 13:27:43 2009 @@ -4671,7 +4671,7 @@ diff --git a/rhino/makefile.mk b/rhino/makefile.mk index d7888fc..91117d9 100644 --- a/rhino/makefile.mk +++ b/rhino/makefile.mk @@ -49,7 +49,7 @@ PATCH_FILES=rhino1_5R5.patch \ rhino1_5R5-find_swing.patch \ rhino1_5R5-updateToolTip.patch -.IF "$(OS)"=="WNT" +.IF "$(OS_FOR_BUILD)"=="WNT" FIXED_TARFILE_LOCATION=`cygpath -m -s "$(TARFILE_LOCATION)"` .ELSE FIXED_TARFILE_LOCATION=$(TARFILE_LOCATION) diff --git a/rhino/prj/d.lst b/rhino/prj/d.lst index 8fb6716..b98f6b7 100644 --- a/rhino/prj/d.lst +++ b/rhino/prj/d.lst @@ -1 +1 @@ -..\%__SRC%\misc\build\rhino1_5R5\build\rhino1_5R5\js.jar %_DEST%\bin%_EXT%\js.jar +..\%__SRC%\misc\build\rhino1_5R5\build\rhino1_5R5\js.jar %_DEST%\bin\js.jar diff --git a/sane/prj/d.lst b/sane/prj/d.lst index ee8c0c6..f592821 100644 --- a/sane/prj/d.lst +++ b/sane/prj/d.lst @@ -1,3 +1,3 @@ -mkdir: %_DEST%\inc%_EXT%\external -mkdir: %_DEST%\inc%_EXT%\external\sane -..\inc\sane.h %_DEST%\inc%_EXT%\external\sane\sane.h +mkdir: %_DEST%\inc\external +mkdir: %_DEST%\inc\external\sane +..\inc\sane.h %_DEST%\inc\external\sane\sane.h diff --git a/translate_toolkit/prj/d.lst b/translate_toolkit/prj/d.lst index 5833cf4..31d61b0 100644 --- a/translate_toolkit/prj/d.lst +++ b/translate_toolkit/prj/d.lst @@ -1,32 +1,35 @@ -mkdir: %_DEST%\lib%_EXT%\translate_toolkit -mkdir: %_DEST%\lib%_EXT%\translate_toolkit\translate -mkdir: %_DEST%\lib%_EXT%\translate_toolkit\translate\convert -mkdir: %_DEST%\lib%_EXT%\translate_toolkit\translate\filters -mkdir: %_DEST%\lib%_EXT%\translate_toolkit\translate\lang -mkdir: %_DEST%\lib%_EXT%\translate_toolkit\translate\misc -mkdir: %_DEST%\lib%_EXT%\translate_toolkit\translate\misc\typecheck -mkdir: %_DEST%\lib%_EXT%\translate_toolkit\translate\storage -mkdir: %_DEST%\lib%_EXT%\translate_toolkit\translate\storage\placeables -mkdir: %_DEST%\lib%_EXT%\translate_toolkit\translate\storage\versioncontrol -mkdir: %_DEST%\lib%_EXT%\translate_toolkit\translate\storage\xml_extract -mkdir: %_DEST%\lib%_EXT%\translate_toolkit\translate\search -mkdir: %_DEST%\lib%_EXT%\translate_toolkit\translate\search\indexing -mkdir: %_DEST%\lib%_EXT%\translate_toolkit\translate\services -mkdir: %_DEST%\lib%_EXT%\translate_toolkit\translate\tools +mkdir: %_DEST%\bin\translate +mkdir: %_DEST%\bin\translate\convert +mkdir: %_DEST%\bin\translate\filters +mkdir: %_DEST%\bin\translate\lang +mkdir: %_DEST%\bin\translate\misc +mkdir: %_DEST%\bin\translate\misc\typecheck +mkdir: %_DEST%\bin\translate\storage +mkdir: %_DEST%\bin\translate\storage\placeables +mkdir: %_DEST%\bin\translate\storage\versioncontrol +mkdir: %_DEST%\bin\translate\storage\xml_extract +mkdir: %_DEST%\bin\translate\search +mkdir: %_DEST%\bin\translate\search\indexing +mkdir: %_DEST%\bin\translate\services +mkdir: %_DEST%\bin\translate\share +mkdir: %_DEST%\bin\translate\share\langmodels +mkdir: %_DEST%\bin\translate\tools -..\%__SRC%\misc\build\translate-toolkit-*\build\lib\translate\* %_DEST%\lib%_EXT%\translate_toolkit\translate\* -..\%__SRC%\misc\build\translate-toolkit-*\build\lib\translate\convert\* %_DEST%\lib%_EXT%\translate_toolkit\translate\convert\* -..\%__SRC%\misc\build\translate-toolkit-*\build\lib\translate\filters\* %_DEST%\lib%_EXT%\translate_toolkit\translate\filters\* -..\%__SRC%\misc\build\translate-toolkit-*\build\lib\translate\lang\* %_DEST%\lib%_EXT%\translate_toolkit\translate\lang\* -..\%__SRC%\misc\build\translate-toolkit-*\build\lib\translate\misc\* %_DEST%\lib%_EXT%\translate_toolkit\translate\misc\* -..\%__SRC%\misc\build\translate-toolkit-*\build\lib\translate\misc/typecheck\* %_DEST%\lib%_EXT%\translate_toolkit\translate\misc/typecheck\* -..\%__SRC%\misc\build\translate-toolkit-*\build\lib\translate\storage\* %_DEST%\lib%_EXT%\translate_toolkit\translate\storage\* -..\%__SRC%\misc\build\translate-toolkit-*\build\lib\translate\storage/placeables\* %_DEST%\lib%_EXT%\translate_toolkit\translate\storage/placeables\* -..\%__SRC%\misc\build\translate-toolkit-*\build\lib\translate\storage/versioncontrol\* %_DEST%\lib%_EXT%\translate_toolkit\translate\storage/versioncontrol\* -..\%__SRC%\misc\build\translate-toolkit-*\build\lib\translate\storage/xml_extract\* %_DEST%\lib%_EXT%\translate_toolkit\translate\storage/xml_extract\* -..\%__SRC%\misc\build\translate-toolkit-*\build\lib\translate\search\* %_DEST%\lib%_EXT%\translate_toolkit\translate\search\* -..\%__SRC%\misc\build\translate-toolkit-*\build\lib\translate\search/indexing\* %_DEST%\lib%_EXT%\translate_toolkit\translate\search/indexing\* -..\%__SRC%\misc\build\translate-toolkit-*\build\lib\translate\services\* %_DEST%\lib%_EXT%\translate_toolkit\translate\services\* -..\%__SRC%\misc\build\translate-toolkit-*\build\lib\translate\tools\* %_DEST%\lib%_EXT%\translate_toolkit\translate\tools\* -..\%__SRC%\misc\build\translate-toolkit-*\build\scripts-*\oo2po %_DEST%\bin%_EXT%\* -..\%__SRC%\misc\build\translate-toolkit-*\build\scripts-*\po2oo %_DEST%\bin%_EXT%\* +..\%__SRC%\misc\build\translate-toolkit-*\translate\* %_DEST%\bin\translate\* +..\%__SRC%\misc\build\translate-toolkit-*\translate\convert\* %_DEST%\bin\translate\convert\* +..\%__SRC%\misc\build\translate-toolkit-*\translate\filters\* %_DEST%\bin\translate\filters\* +..\%__SRC%\misc\build\translate-toolkit-*\translate\lang\* %_DEST%\bin\translate\lang\* +..\%__SRC%\misc\build\translate-toolkit-*\translate\misc\* %_DEST%\bin\translate\misc\* +..\%__SRC%\misc\build\translate-toolkit-*\translate\misc/typecheck\* %_DEST%\bin\translate\misc/typecheck\* +..\%__SRC%\misc\build\translate-toolkit-*\translate\storage\* %_DEST%\bin\translate\storage\* +..\%__SRC%\misc\build\translate-toolkit-*\translate\storage/placeables\* %_DEST%\bin\translate\storage/placeables\* +..\%__SRC%\misc\build\translate-toolkit-*\translate\storage/versioncontrol\* %_DEST%\bin\translate\storage/versioncontrol\* +..\%__SRC%\misc\build\translate-toolkit-*\translate\storage/xml_extract\* %_DEST%\bin\translate\storage/xml_extract\* +..\%__SRC%\misc\build\translate-toolkit-*\translate\search\* %_DEST%\bin\translate\search\* +..\%__SRC%\misc\build\translate-toolkit-*\translate\search/indexing\* %_DEST%\bin\translate\search/indexing\* +..\%__SRC%\misc\build\translate-toolkit-*\translate\services\* %_DEST%\bin\translate\services\* +..\%__SRC%\misc\build\translate-toolkit-*\translate\share\* %_DEST%\bin\translate\share\* +..\%__SRC%\misc\build\translate-toolkit-*\translate\share\langmodels\* %_DEST%\bin\translate\share\langmodels\* +..\%__SRC%\misc\build\translate-toolkit-*\translate\tools\* %_DEST%\bin\translate\tools\* +..\%__SRC%\misc\build\translate-toolkit-*\build\scripts-*\oo2po %_DEST%\bin\* +..\%__SRC%\misc\build\translate-toolkit-*\build\scripts-*\po2oo %_DEST%\bin\* diff --git a/twain/prj/d.lst b/twain/prj/d.lst index e26c5db..0827b03 100644 --- a/twain/prj/d.lst +++ b/twain/prj/d.lst @@ -1,3 +1,3 @@ -mkdir: %_DEST%\inc%_EXT%\external -mkdir: %_DEST%\inc%_EXT%\external\twain -..\%__SRC%\inc\twain.h %_DEST%\inc%_EXT%\external\twain\twain.h +mkdir: %_DEST%\inc\external +mkdir: %_DEST%\inc\external\twain +..\%__SRC%\inc\twain.h %_DEST%\inc\external\twain\twain.h diff --git a/unixODBC/inc/sqltypes.h b/unixODBC/inc/sqltypes.h index 130de90..5bee0d6 100644 --- a/unixODBC/inc/sqltypes.h +++ b/unixODBC/inc/sqltypes.h @@ -75,11 +75,7 @@ extern "C" { #define FAR #define CALLBACK -#ifdef __OS2__ -#define SQL_API _System -#else #define SQL_API -#endif #define BOOL int typedef void* HWND; typedef char CHAR; diff --git a/unixODBC/prj/d.lst b/unixODBC/prj/d.lst index 2825e1c..6b3fa94 100644 --- a/unixODBC/prj/d.lst +++ b/unixODBC/prj/d.lst @@ -1,3 +1,3 @@ -mkdir: %_DEST%\inc%_EXT%\external -mkdir: %_DEST%\inc%_EXT%\external\odbc -..\inc\*.h %_DEST%\inc%_EXT%\external\odbc\*.h +mkdir: %_DEST%\inc\external +mkdir: %_DEST%\inc\external\odbc +..\inc\*.h %_DEST%\inc\external\odbc\*.h diff --git a/vigra/prj/d.lst b/vigra/prj/d.lst index 395b3e4..ddf8faf 100644 --- a/vigra/prj/d.lst +++ b/vigra/prj/d.lst @@ -1,3 +1,3 @@ -mkdir: %_DEST%\inc%_EXT%\vigra +mkdir: %_DEST%\inc\vigra -..\%__SRC%\misc\build\vigra1.4.0\include\vigra\*.hxx %_DEST%\inc%_EXT%\vigra\*.hxx +..\%__SRC%\misc\build\vigra1.4.0\include\vigra\*.hxx %_DEST%\inc\vigra\*.hxx diff --git a/x11_extensions/prj/d.lst b/x11_extensions/prj/d.lst index ca96875..d3c8c6a 100644 --- a/x11_extensions/prj/d.lst +++ b/x11_extensions/prj/d.lst @@ -1,5 +1,5 @@ -mkdir: %_DEST%\inc%_EXT%\X11 -mkdir: %_DEST%\inc%_EXT%\X11\extensions +mkdir: %_DEST%\inc\X11 +mkdir: %_DEST%\inc\X11\extensions -..\inc\*.h %_DEST%\inc%_EXT%\X11\extensions\*.h +..\inc\*.h %_DEST%\inc\X11\extensions\*.h diff --git a/xsltml/prj/d.lst b/xsltml/prj/d.lst index fec9689..ee5b0e2 100644 --- a/xsltml/prj/d.lst +++ b/xsltml/prj/d.lst @@ -1,6 +1,6 @@ -mkdir: %_DEST%\bin%_EXT%\xslt -mkdir: %_DEST%\bin%_EXT%\xslt\export -mkdir: %_DEST%\bin%_EXT%\xslt\export\xsltml +mkdir: %_DEST%\bin\xslt +mkdir: %_DEST%\bin\xslt\export +mkdir: %_DEST%\bin\xslt\export\xsltml -..\%__SRC%\misc\build\xsltml_2.1.2\*.xsl %_DEST%\bin%_EXT%\xslt\export\xsltml\*.xsl +..\%__SRC%\misc\build\xsltml_2.1.2\*.xsl %_DEST%\bin\xslt\export\xsltml\*.xsl |