Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
VLC
Manage
Activity
Members
Labels
Plan
Issues
4k
Issue boards
Milestones
Code
Merge requests
454
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Analyze
Contributor analytics
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
VideoLAN
VLC
Commits
a35f61f0
Commit
a35f61f0
authored
9 years ago
by
Thomas Guillem
Browse files
Options
Downloads
Patches
Plain Diff
contrib: iconv: remove unused android-ios patch
bins.patch is now enough.
parent
8ed7b5eb
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
contrib/src/iconv/libiconv-android-ios.patch
+0
-34
0 additions, 34 deletions
contrib/src/iconv/libiconv-android-ios.patch
contrib/src/iconv/rules.mak
+0
-6
0 additions, 6 deletions
contrib/src/iconv/rules.mak
with
0 additions
and
40 deletions
contrib/src/iconv/libiconv-android-ios.patch
deleted
100644 → 0
+
0
−
34
View file @
8ed7b5eb
--- iconv/Makefile.in.orig 2013-08-25 00:49:42.477424777 +0200
+++ iconv/Makefile.in 2013-08-25 00:50:28.117422857 +0200
@@ -32,10 +32,6 @@
all : lib/localcharset.h force
cd lib && $(MAKE) all
cd preload && $(MAKE) all
- cd srclib && $(MAKE) all
- cd po && $(MAKE) all
- cd man && $(MAKE) all
- if test -d tests; then cd tests && $(MAKE) all; fi
lib/localcharset.h :
builddir="`pwd`"; cd libcharset && $(MAKE) all && $(MAKE) install-lib libdir="$$builddir/lib" includedir="$$builddir/lib"
@@ -51,11 +47,8 @@
cd libcharset && $(MAKE) install prefix='$(prefix)' exec_prefix='$(exec_prefix)' libdir='$(libdir)'
cd lib && $(MAKE) install prefix='$(prefix)' exec_prefix='$(exec_prefix)' libdir='$(libdir)'
cd preload && $(MAKE) install prefix='$(prefix)' exec_prefix='$(exec_prefix)' libdir='$(libdir)'
- cd srclib && $(MAKE) install prefix='$(prefix)' exec_prefix='$(exec_prefix)' libdir='$(libdir)'
if [ ! -d $(DESTDIR)$(includedir) ] ; then $(mkinstalldirs) $(DESTDIR)$(includedir) ; fi
$(INSTALL_DATA) include/iconv.h.inst $(DESTDIR)$(includedir)/iconv.h
- cd po && $(MAKE) install prefix='$(prefix)' exec_prefix='$(exec_prefix)' datarootdir='$(datarootdir)' datadir='$(datadir)'
- cd man && $(MAKE) install prefix='$(prefix)' exec_prefix='$(exec_prefix)' datarootdir='$(datarootdir)' datadir='$(datadir)' mandir='$(mandir)'
install-strip : lib/localcharset.h force
cd libcharset && $(MAKE) install-strip prefix='$(prefix)' exec_prefix='$(exec_prefix)' libdir='$(libdir)'
@@ -64,8 +57,6 @@
cd srclib && $(MAKE) install-strip prefix='$(prefix)' exec_prefix='$(exec_prefix)' libdir='$(libdir)'
if [ ! -d $(DESTDIR)$(includedir) ] ; then $(mkinstalldirs) $(DESTDIR)$(includedir) ; fi
$(INSTALL_DATA) include/iconv.h.inst $(DESTDIR)$(includedir)/iconv.h
- cd po && $(MAKE) install-strip prefix='$(prefix)' exec_prefix='$(exec_prefix)' datarootdir='$(datarootdir)' datadir='$(datadir)'
- cd man && $(MAKE) install-strip prefix='$(prefix)' exec_prefix='$(exec_prefix)' datarootdir='$(datarootdir)' datadir='$(datadir)' mandir='$(mandir)'
installdirs : force
cd libcharset && $(MAKE) installdirs prefix='$(prefix)' exec_prefix='$(exec_prefix)' libdir='$(libdir)'
This diff is collapsed.
Click to expand it.
contrib/src/iconv/rules.mak
+
0
−
6
View file @
a35f61f0
...
...
@@ -21,12 +21,6 @@ iconv: libiconv-$(LIBICONV_VERSION).tar.gz .sum-iconv
$(
APPLY
)
$(
SRC
)
/iconv/libiconv-c11.patch
ifdef
HAVE_WIN64
$(
APPLY
)
$(
SRC
)
/iconv/libiconv-win64.patch
endif
ifdef
HAVE_ANDROID
$(
APPLY
)
$(
SRC
)
/iconv/libiconv-android-ios.patch
endif
ifdef
HAVE_IOS
$(
APPLY
)
$(
SRC
)
/iconv/libiconv-android-ios.patch
endif
$(
UPDATE_AUTOCONFIG
)
&&
cd
$(
UNPACK_DIR
)
&&
mv
config.guess config.sub build-aux
$(
UPDATE_AUTOCONFIG
)
&&
cd
$(
UNPACK_DIR
)
&&
mv
config.guess config.sub libcharset/build-aux
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment