Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-1.1
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-1.1
Commits
c0e8b04d
Commit
c0e8b04d
authored
Feb 18, 2010
by
Rafaël Carré
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix live555 compile on armlinux
parent
e2613339
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
33 additions
and
0 deletions
+33
-0
extras/contrib/src/Makefile
extras/contrib/src/Makefile
+5
-0
extras/contrib/src/Patches/live-armlinux.patch
extras/contrib/src/Patches/live-armlinux.patch
+28
-0
No files found.
extras/contrib/src/Makefile
View file @
c0e8b04d
...
...
@@ -1238,12 +1238,17 @@ ifdef HAVE_UCLIBC
ifdef
HAVE_BIGENDIAN
(
cd
$<
;
./genMakefiles armeb-uclibc
&&
make
$(HOSTCC)
)
endif
else
ifeq
($(ARCH),armel)
patch
-p0
< Patches/live-armlinux.patch
(
cd
$<
;
./genMakefiles armlinux
&&
make
$(HOSTCC)
)
else
(
cd
$<
;
sed
-e
's%-D_FILE_OFFSET_BITS=64%-D_FILE_OFFSET_BITS=64\ -fPIC\ -DPIC%'
-i
.orig config.linux
)
(
cd
$<
;
./genMakefiles linux
&&
make
$(HOSTCC)
)
endif
endif
endif
endif
endif
mkdir
-p
$(PREFIX)
/lib
$(PREFIX)
/include
cp
$<
/groupsock/libgroupsock.a
$(PREFIX)
/lib
...
...
extras/contrib/src/Patches/live-armlinux.patch
0 → 100644
View file @
c0e8b04d
Use g++ to build/link C++
Use environment CROSS_COMPILE if present
Do not use ar -L. when linking
Put a space between ar options and arguments
--- live/config.armlinux.orig 2010-02-18 08:11:09.000000000 +0100
+++ live/config.armlinux 2010-02-18 08:11:20.000000000 +0100
@@ -1,16 +1,16 @@
-CROSS_COMPILE= arm-elf-
+CROSS_COMPILE?= arm-elf-
COMPILE_OPTS = $(INCLUDES) -I. -O2 -DSOCKLEN_T=socklen_t -DNO_SSTREAM=1 -D_LARGEFILE_SOURCE=1 -D_FILE_OFFSET_BITS=64
C = c
C_COMPILER = $(CROSS_COMPILE)gcc
C_FLAGS = $(COMPILE_OPTS)
CPP = cpp
-CPLUSPLUS_COMPILER = $(CROSS_COMPILE)gcc
+CPLUSPLUS_COMPILER = $(CROSS_COMPILE)g++
CPLUSPLUS_FLAGS = $(COMPILE_OPTS) -Wall -DBSD=1
OBJ = o
-LINK = $(CROSS_COMPILE)gcc -o
-LINK_OPTS = -L.
+LINK = $(CROSS_COMPILE)g++ -o
+LINK_OPTS =
CONSOLE_LINK_OPTS = $(LINK_OPTS)
-LIBRARY_LINK = $(CROSS_COMPILE)ar cr
+LIBRARY_LINK = $(CROSS_COMPILE)ar cr
LIBRARY_LINK_OPTS = $(LINK_OPTS)
LIB_SUFFIX = a
LIBS_FOR_CONSOLE_APPLICATION =
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