Permalink
Browse files

OS-2412 64-bit iconv modules should match 32-bit

  • Loading branch information...
1 parent cf85060 commit c1215abcfba50b017f86a3dfbdb011647e3e4673 @wesolows wesolows committed Aug 2, 2013
Showing with 13 additions and 0 deletions.
  1. +7 −0 g11n/Makefile
  2. +6 −0 manifest
View
7 g11n/Makefile
@@ -25,18 +25,25 @@ include ../Makefile.defs
SRC=$(shell (pwd))
LIBDIR=${DESTDIR}/usr/lib/iconv
+LIB64DIR=$(LIBDIR)/amd64
all:
@(cd src; pwd; unset MAKE; SRC=$(SRC) $(SUN_MAKE) all)
install: all
@(cd src; pwd; unset MAKE; SRC=$(SRC) $(SUN_MAKE) install)
mkdir -p $(LIBDIR)
+ mkdir -p $(LIB64DIR)
cp proto/i386/fileroot/usr/lib/iconv/UTF-8%646.so $(LIBDIR)
cp proto/i386/fileroot/usr/lib/iconv/UTF-8%UCS-2.so $(LIBDIR)
cp proto/i386/fileroot/usr/lib/iconv/UTF-8%UCS-2LE.so $(LIBDIR)
cp proto/i386/fileroot/usr/lib/iconv/UCS-2%UTF-8.so $(LIBDIR)
cp proto/i386/fileroot/usr/lib/iconv/UCS-2LE%UTF-8.so $(LIBDIR)
+ cp proto/i386/fileroot/usr/lib/iconv/amd64/UTF-8%646.so $(LIB64DIR)
+ cp proto/i386/fileroot/usr/lib/iconv/amd64/UTF-8%UCS-2.so $(LIB64DIR)
+ cp proto/i386/fileroot/usr/lib/iconv/amd64/UTF-8%UCS-2LE.so $(LIB64DIR)
+ cp proto/i386/fileroot/usr/lib/iconv/amd64/UCS-2%UTF-8.so $(LIB64DIR)
+ cp proto/i386/fileroot/usr/lib/iconv/amd64/UCS-2LE%UTF-8.so $(LIB64DIR)
clean:
@(cd src; pwd; unset MAKE; SRC=$(SRC) $(SUN_MAKE) clean)
View
6 manifest
@@ -97,11 +97,17 @@ f usr/bin/dialog 0755 root bin
f usr/share/man/man1/dialog.1 0444 root bin
# g11n
d usr/lib/iconv 0755 root bin
+d usr/lib/iconv/amd64 0755 root bin
f usr/lib/iconv/UTF-8%646.so 0755 root bin
f usr/lib/iconv/UTF-8%UCS-2.so 0755 root bin
f usr/lib/iconv/UTF-8%UCS-2LE.so 0755 root bin
f usr/lib/iconv/UCS-2%UTF-8.so 0755 root bin
f usr/lib/iconv/UCS-2LE%UTF-8.so 0755 root bin
+f usr/lib/iconv/amd64/UTF-8%646.so 0755 root bin
+f usr/lib/iconv/amd64/UTF-8%UCS-2.so 0755 root bin
+f usr/lib/iconv/amd64/UTF-8%UCS-2LE.so 0755 root bin
+f usr/lib/iconv/amd64/UCS-2%UTF-8.so 0755 root bin
+f usr/lib/iconv/amd64/UCS-2LE%UTF-8.so 0755 root bin
# gcc
f usr/lib/amd64/libgcc_s.so.1 0555 root bin
f usr/lib/amd64/libstdc++.so.6.0.13 0555 root bin

0 comments on commit c1215ab

Please sign in to comment.