Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-2-2
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
videolan
vlc-2-2
Commits
6d13c3b6
Commit
6d13c3b6
authored
Aug 03, 2011
by
Rémi Denis-Courmont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
contrib: matroska needs PIC on Linux even for staticlib
parent
47645e9e
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
23 additions
and
0 deletions
+23
-0
contrib/src/matroska/matroska-pic.patch
contrib/src/matroska/matroska-pic.patch
+22
-0
contrib/src/matroska/rules.mak
contrib/src/matroska/rules.mak
+1
-0
No files found.
contrib/src/matroska/matroska-pic.patch
0 → 100644
View file @
6d13c3b6
diff -ru libmatroska.orig/make/linux/Makefile libmatroska/make/linux/Makefile
--- libmatroska.orig/make/linux/Makefile 2011-06-15 15:00:37.000000000 +0300
+++ libmatroska/make/linux/Makefile 2011-08-03 13:33:25.000000000 +0300
@@ -65,7 +65,7 @@
# object files; replace .cxx extension with .o
objects:=$(patsubst %$(EXTENSION),%.o,$(sources))
-objects_so:=$(patsubst %$(EXTENSION),%.lo,$(sources))
+objects_so:=$(objects)
WARNINGFLAGS=-Wall -Wno-unknown-pragmas -ansi -fno-gnu-keywords -D_GNU_SOURCE \
-Wshadow
@@ -89,9 +89,6 @@
# Build rules
%.o: %$(EXTENSION)
- $(CXX) -c $(COMPILEFLAGS) -o $@ $<
-
-%.lo: %$(EXTENSION)
$(CXX) -c $(COMPILEFLAGS) -fPIC -o $@ $<
$(LIBRARY): $(objects)
contrib/src/matroska/rules.mak
View file @
6d13c3b6
...
@@ -14,6 +14,7 @@ $(TARBALLS)/libmatroska-$(MATROSKA_VERSION).tar.bz2:
...
@@ -14,6 +14,7 @@ $(TARBALLS)/libmatroska-$(MATROSKA_VERSION).tar.bz2:
libmatroska
:
libmatroska-$(MATROSKA_VERSION).tar.bz2 .sum-matroska
libmatroska
:
libmatroska-$(MATROSKA_VERSION).tar.bz2 .sum-matroska
$(UNPACK)
$(UNPACK)
$(APPLY)
$(SRC)
/matroska/matroska-pic.patch
$(MOVE)
$(MOVE)
.matroska
:
libmatroska
.matroska
:
libmatroska
...
...
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