Skip to content
Projeler
Gruplar
Parçacıklar
Yardım
Yükleniyor...
Oturum aç / Kaydol
Gezinmeyi değiştir
C
core
Proje
Proje
Ayrıntılar
Etkinlik
Cycle Analytics
Depo (repository)
Depo (repository)
Dosyalar
Kayıtlar (commit)
Dallar (branch)
Etiketler
Katkıda bulunanlar
Grafik
Karşılaştır
Grafikler
Konular (issue)
0
Konular (issue)
0
Liste
Pano
Etiketler
Kilometre Taşları
Birleştirme (merge) Talepleri
0
Birleştirme (merge) Talepleri
0
CI / CD
CI / CD
İş akışları (pipeline)
İşler
Zamanlamalar
Grafikler
Paketler
Paketler
Wiki
Wiki
Parçacıklar
Parçacıklar
Üyeler
Üyeler
Collapse sidebar
Close sidebar
Etkinlik
Grafik
Grafikler
Yeni bir konu (issue) oluştur
İşler
Kayıtlar (commit)
Konu (issue) Panoları
Kenar çubuğunu aç
LibreOffice
core
Commits
fc1eaf33
Kaydet (Commit)
fc1eaf33
authored
Nis 03, 2013
tarafından
Michael Stahl
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
libxml2: remove usage of dmake remnant LIBXML2LIB
Change-Id: I8a4f298af99f3415b0ef7a3fc5d69642b5b71f62
üst
7be158cd
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
3 additions
and
6 deletions
+3
-6
libxml2-configure.patch
libxml2/libxml2-configure.patch
+1
-1
ExternalProject_xslt.mk
libxslt/ExternalProject_xslt.mk
+1
-1
ExternalProject_raptor.mk
redland/ExternalProject_raptor.mk
+1
-3
ExternalProject_rasqal.mk
redland/ExternalProject_rasqal.mk
+0
-1
No files found.
libxml2/libxml2-configure.patch
Dosyayı görüntüle @
fc1eaf33
...
...
@@ -129,7 +129,7 @@
- else
- echo @XML_LIBDIR@ @XML_LIBS@ @WIN32_EXTRA_LIBADD@
- fi
+ echo -L${libdir}
${LIBXML2LIB}
-lm
+ echo -L${libdir}
-lxml2
-lm
+# if [ "`uname`" = "Linux" ]
+# then
+# if [ "@XML_LIBDIR@" = "-L/usr/lib" -o "@XML_LIBDIR@" = "-L/usr/lib64" ]
...
...
libxslt/ExternalProject_xslt.mk
Dosyayı görüntüle @
fc1eaf33
...
...
@@ -49,7 +49,7 @@ $(call gb_ExternalProject_get_state_target,xslt,build):
$(if $(filter TRUE,$(DISABLE_DYNLOADING)), \
$(if $(filter IOS,$(OS)),LIBS="-liconv") \
--disable-shared,--disable-static) \
$(if $(filter NO,$(SYSTEM_LIBXML)),--with-libxml-prefix=$(OUTDIR)
LIBXML2LIB=-lxml2
) \
$(if $(filter NO,$(SYSTEM_LIBXML)),--with-libxml-prefix=$(OUTDIR)) \
&& chmod 777 xslt-config \
&& $(MAKE) \
)
...
...
redland/ExternalProject_raptor.mk
Dosyayı görüntüle @
fc1eaf33
...
...
@@ -22,7 +22,6 @@ $(call gb_ExternalProject_get_state_target,raptor,build):
$(call gb_ExternalProject_run,build,\
CC="$(CC) -mthreads $(if $(filter YES,$(MINGW_SHARED_GCCLIB)),-shared-libgcc)" \
LDFLAGS="-Wl$(COMMA)--no-undefined -Wl$(COMMA)--enable-runtime-pseudo-reloc-v2 -Wl$(COMMA)--export-all-symbols $(subst ;, -L,$(ILIB))" \
LIBXML2LIB="$(if $(filter YES,$(SYSTEM_LIBXML)),$(LIBXML_LIBS),-lxml2)" \
XSLTLIB="$(if $(filter YES,$(SYSTEM_LIBXSLT)),$(LIBXSLT_LIBS),-lxslt)" \
OBJDUMP="$(HOST_PLATFORM)-objdump" \
./configure --disable-static --enable-shared --disable-gtk-doc \
...
...
@@ -49,8 +48,7 @@ $(call gb_ExternalProject_get_state_target,raptor,build):
$(if $(filter MACOSX,$(OS)),--prefix=/@.__________________________________________________OOO) \
$(if $(filter IOS ANDROID,$(OS)),--disable-shared,--disable-static) \
$(if $(filter NO,$(SYSTEM_LIBXSLT)),--with-xslt-config=$(OUTDIR)/bin/xslt-config) \
$(if $(filter NO,$(SYSTEM_LIBXML)), \
LIBXML2LIB=-lxml2 --with-xml2-config=$(OUTDIR)/bin/xml2-config) \
$(if $(filter NO,$(SYSTEM_LIBXML)),--with-xml2-config=$(OUTDIR)/bin/xml2-config) \
&& $(MAKE) \
)
endif
...
...
redland/ExternalProject_rasqal.mk
Dosyayı görüntüle @
fc1eaf33
...
...
@@ -26,7 +26,6 @@ $(call gb_ExternalProject_get_state_target,rasqal,build):
$(call gb_ExternalProject_run,build,\
CC="$(CC) -mthreads $(if $(filter YES,$(MINGW_SHARED_GCCLIB)),-shared-libgcc)" \
LDFLAGS="-Wl$(COMMA)--no-undefined -Wl$(COMMA)--enable-runtime-pseudo-reloc-v2 -Wl$(COMMA)--export-all-symbols $(subst ;, -L$,$(ILIB))" \
LIBXML2LIB="$(if $(filter YES,$(SYSTEM_LIBXML)),$(LIBXML_LIBS),-lxml2)" \
XSLTLIB="$(if $(filter YES,$(SYSTEM_LIBXSLT)),$(LIBXSLT_LIBS),-lxslt)" \
OBJDUMP="$(HOST_PLATFORM)-objdump" \
PKG_CONFIG="" \
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment