jengelh/icu
SHA256
1
0
Fork 0
forked from pool/icu
Code Pull Requests Activity
a9073dbebf
icu/icu-fix-install-mode-files.diff

54 lines
2.9 KiB
Diff
Raw Normal View History

Accepting request 183017 from home:jengelh:icu - Change icu-versioning.diff: Resolve libqt4 emitting a warning that it cannot dlopen libicui18n.so - Build I18N data as a plain file rather than as an arch-dependent huge shared library - Add icu-fix-install-mode-files.diff OBS-URL: https://build.opensuse.org/request/show/183017 OBS-URL: https://build.opensuse.org/package/show/X11:common:Factory/icu?expand=0&rev=30
2013-07-14 17:27:58 +02:00
From: Jan Engelhardt <jengelh@inai.de>
Date: 2013-06-28 12:54:31.002040372 +0200
build: fix abort of install procedure with packaging=files
When ./configure --with-data-packaging=files, make install aborts
because the previous developer did not test it with a normal
user account/DESTDIR install.
make[1]: Entering directory `/home/abuild/rpmbuild/BUILD/icu/source/data'
LD_LIBRARY_PATH=../stubdata:../tools/ctestfw:../lib:$LD_LIBRARY_PATH ../bin/pkgdata -O ../data/icupkg.inc -q -c -s /home/abuild/rpmbuild/BUILD/icu/source/data/out/build/icudt51l -d ./out -e icudt51 -T ./out/tmp -p icudt51l -m files -r 51.2 ./out/tmp/icudata.lst
/bin/sh ../mkinstalldirs /home/abuild/rpmbuild/BUILDROOT/icu-51.2-0.x86_64/usr/share/icu/51.2
mkdir /home/abuild/rpmbuild/BUILDROOT/icu-51.2-0.x86_64/usr/share/icu
mkdir /home/abuild/rpmbuild/BUILDROOT/icu-51.2-0.x86_64/usr/share/icu/51.2
/bin/sh ../mkinstalldirs /usr/share/icu/51.2/icudt51l
mkdir /usr/share/icu
mkdir: cannot create directory '/usr/share/icu': Permission denied
---
icu-54 OBS-URL: https://build.opensuse.org/package/show/X11:common:Factory/icu?expand=0&rev=56
2014-10-11 18:52:20 +02:00
source/data/Makefile.in | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
Accepting request 183017 from home:jengelh:icu - Change icu-versioning.diff: Resolve libqt4 emitting a warning that it cannot dlopen libicui18n.so - Build I18N data as a plain file rather than as an arch-dependent huge shared library - Add icu-fix-install-mode-files.diff OBS-URL: https://build.opensuse.org/request/show/183017 OBS-URL: https://build.opensuse.org/package/show/X11:common:Factory/icu?expand=0&rev=30
2013-07-14 17:27:58 +02:00
Index: icu/source/data/Makefile.in
===================================================================
--- icu.orig/source/data/Makefile.in
+++ icu/source/data/Makefile.in
icu-54 OBS-URL: https://build.opensuse.org/package/show/X11:common:Factory/icu?expand=0&rev=56
2014-10-11 18:52:20 +02:00
@@ -196,16 +196,16 @@ endif
Accepting request 183017 from home:jengelh:icu - Change icu-versioning.diff: Resolve libqt4 emitting a warning that it cannot dlopen libicui18n.so - Build I18N data as a plain file rather than as an arch-dependent huge shared library - Add icu-fix-install-mode-files.diff OBS-URL: https://build.opensuse.org/request/show/183017 OBS-URL: https://build.opensuse.org/package/show/X11:common:Factory/icu?expand=0&rev=30
2013-07-14 17:27:58 +02:00
install-local: $(PKGDATA_LIST) ./icupkg.inc packagedata $(OS390INSTALL)
$(MKINSTALLDIRS) $(TMPDATADIR) $(DESTDIR)$(ICUPKGDATA_DIR)
ifeq ($(PKGDATA_MODE),files)
- $(MKINSTALLDIRS) $(ICUPKGDATA_DIR)/$(ICUDATA_NAME)
- $(MKINSTALLDIRS) $(ICUPKGDATA_DIR)/$(ICUDATA_NAME)/$(CURR_TREE)
- $(MKINSTALLDIRS) $(ICUPKGDATA_DIR)/$(ICUDATA_NAME)/$(LANG_TREE)
- $(MKINSTALLDIRS) $(ICUPKGDATA_DIR)/$(ICUDATA_NAME)/$(REGION_TREE)
- $(MKINSTALLDIRS) $(ICUPKGDATA_DIR)/$(ICUDATA_NAME)/$(ZONE_TREE)
icu-54 OBS-URL: https://build.opensuse.org/package/show/X11:common:Factory/icu?expand=0&rev=56
2014-10-11 18:52:20 +02:00
- $(MKINSTALLDIRS) $(ICUPKGDATA_DIR)/$(ICUDATA_NAME)/$(UNIT_TREE)
Accepting request 183017 from home:jengelh:icu - Change icu-versioning.diff: Resolve libqt4 emitting a warning that it cannot dlopen libicui18n.so - Build I18N data as a plain file rather than as an arch-dependent huge shared library - Add icu-fix-install-mode-files.diff OBS-URL: https://build.opensuse.org/request/show/183017 OBS-URL: https://build.opensuse.org/package/show/X11:common:Factory/icu?expand=0&rev=30
2013-07-14 17:27:58 +02:00
- $(MKINSTALLDIRS) $(ICUPKGDATA_DIR)/$(ICUDATA_NAME)/$(BREAK_TREE)
- $(MKINSTALLDIRS) $(ICUPKGDATA_DIR)/$(ICUDATA_NAME)/$(COLLATION_TREE)
- $(MKINSTALLDIRS) $(ICUPKGDATA_DIR)/$(ICUDATA_NAME)/$(RBNF_TREE)
- $(MKINSTALLDIRS) $(ICUPKGDATA_DIR)/$(ICUDATA_NAME)/$(TRANSLIT_TREE)
+ $(MKINSTALLDIRS) $(DESTDIR)$(ICUPKGDATA_DIR)/$(ICUDATA_NAME)
+ $(MKINSTALLDIRS) $(DESTDIR)$(ICUPKGDATA_DIR)/$(ICUDATA_NAME)/$(CURR_TREE)
+ $(MKINSTALLDIRS) $(DESTDIR)$(ICUPKGDATA_DIR)/$(ICUDATA_NAME)/$(LANG_TREE)
+ $(MKINSTALLDIRS) $(DESTDIR)$(ICUPKGDATA_DIR)/$(ICUDATA_NAME)/$(REGION_TREE)
+ $(MKINSTALLDIRS) $(DESTDIR)$(ICUPKGDATA_DIR)/$(ICUDATA_NAME)/$(ZONE_TREE)
icu-54 OBS-URL: https://build.opensuse.org/package/show/X11:common:Factory/icu?expand=0&rev=56
2014-10-11 18:52:20 +02:00
+ $(MKINSTALLDIRS) $(DESTDIR)$(ICUPKGDATA_DIR)/$(ICUDATA_NAME)/$(UNIT_TREE)
Accepting request 183017 from home:jengelh:icu - Change icu-versioning.diff: Resolve libqt4 emitting a warning that it cannot dlopen libicui18n.so - Build I18N data as a plain file rather than as an arch-dependent huge shared library - Add icu-fix-install-mode-files.diff OBS-URL: https://build.opensuse.org/request/show/183017 OBS-URL: https://build.opensuse.org/package/show/X11:common:Factory/icu?expand=0&rev=30
2013-07-14 17:27:58 +02:00
+ $(MKINSTALLDIRS) $(DESTDIR)$(ICUPKGDATA_DIR)/$(ICUDATA_NAME)/$(BREAK_TREE)
+ $(MKINSTALLDIRS) $(DESTDIR)$(ICUPKGDATA_DIR)/$(ICUDATA_NAME)/$(COLLATION_TREE)
+ $(MKINSTALLDIRS) $(DESTDIR)$(ICUPKGDATA_DIR)/$(ICUDATA_NAME)/$(RBNF_TREE)
+ $(MKINSTALLDIRS) $(DESTDIR)$(ICUPKGDATA_DIR)/$(ICUDATA_NAME)/$(TRANSLIT_TREE)
endif
ifneq ($(ENABLE_STATIC),)
ifeq ($(PKGDATA_MODE),dll)
Copy Permalink