Hello,
Philip S. Hempel a écrit :
I know that someone is working on the fixes for the 64 bit arches and
they have not completed the fixes for it, I am willing to setup a
chroot account for him if he needs to help fix the rest of these
errors in the build.
I managed to build NG's trunk on amd 64 using the attached patch.
Unfortunately, i can't test it :-(. Could you please try it after
applying this patch and report any issue you may have?
To apply this patch, cd into the root of your working copy and enter the
following command line:
patch -p0 < amd64.patch
It should apply without any error. Then, rebuild NG.
Thank you very much to Philip and misc on #openwengo!
--
Julien Gilli
OpenWengo, the free and multiplatform VoIP client
http://dev.openwengo.com/
Index: wifo/phapi/phapi.c
===================================================================
--- wifo/phapi/phapi.c (revision 4040)
+++ wifo/phapi/phapi.c (working copy)
@@ -385,7 +385,7 @@
/* audio_dev */ "" ,
/* softboost */ 0,0,0,
/* vad */ 0,0,0,
- 0,0,0,
+ 0,0,0,0,
/* stunserver */ "80.118.132.74",
0
};
Index: SConstruct
===================================================================
--- SConstruct (revision 4040)
+++ SConstruct (working copy)
@@ -10,6 +10,9 @@
if env.File('SOptions').exists():
env.SConscript('SOptions')
+env.WengoAddCCFlags(['-fPIC'])
+env.WengoAddLinkFlags(['-fPIC'])
+
#Duplicate = 0 is very important: it tells SCons
#to not duplicate the source code inside the build directory;
#without this it cannot work.
Index: libs/ffmpeg/SConscript-avcodec
===================================================================
--- libs/ffmpeg/SConscript-avcodec (revision 4040)
+++ libs/ffmpeg/SConscript-avcodec (working copy)
@@ -12,7 +12,7 @@
env.WengoUseLibraries(libs)
env.WengoAutoconf('avcodec', ['libavcodec/libavcodec.a'],
- './configure', 'cd libavcodec && make',
+ './configure --disable-mmx', 'cd libavcodec && make',
['configure'], ['config.mak'])
Index: libs/ffmpeg/SConscript-avutil
===================================================================
--- libs/ffmpeg/SConscript-avutil (revision 4040)
+++ libs/ffmpeg/SConscript-avutil (working copy)
@@ -6,6 +6,6 @@
env.WengoAddIncludePath(includes)
env.WengoAutoconf('avutil', ['libavutil/libavutil.a'],
- './configure', 'cd libavutil && make',
+ './configure --disable-mmx', 'cd libavutil && make',
['configure'], ['config.mak'])
Index: libs/ffmpeg/libavutil/Makefile
===================================================================
--- libs/ffmpeg/libavutil/Makefile (revision 4040)
+++ libs/ffmpeg/libavutil/Makefile (working copy)
@@ -6,8 +6,8 @@
VPATH=$(SRC_PATH)/libavutil
# NOTE: -I.. is needed to include config.h
-CFLAGS=$(OPTFLAGS) -DHAVE_AV_CONFIG_H -I.. -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE
-
+CFLAGS=$(OPTFLAGS) -DHAVE_AV_CONFIG_H -I.. -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE -fPIC
+LDFLAGS+=-fPIC
OBJS= mathematics.o \
integer.o \
rational.o \
Index: libs/ffmpeg/libavcodec/SConscript
===================================================================
--- libs/ffmpeg/libavcodec/SConscript (revision 4040)
+++ libs/ffmpeg/libavcodec/SConscript (working copy)
@@ -75,7 +75,7 @@
'dvbsubdec.c'
]
-sources = core_sources + i386_sources
+sources = core_sources #+ i386_sources
env = WengoGetEnvironment()
Index: libs/ffmpeg/libavcodec/Makefile
===================================================================
--- libs/ffmpeg/libavcodec/Makefile (revision 4040)
+++ libs/ffmpeg/libavcodec/Makefile (working copy)
@@ -7,8 +7,8 @@
VPATH=$(SRC_PATH)/libavcodec
# NOTE: -I.. is needed to include config.h
-CFLAGS=$(OPTFLAGS) -DHAVE_AV_CONFIG_H -I.. -I$(SRC_PATH)/libavutil -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE $(AMR_CFLAGS)
-
+CFLAGS=$(OPTFLAGS) -DHAVE_AV_CONFIG_H -I.. -I$(SRC_PATH)/libavutil -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE $(AMR_CFLAGS) -fPIC
+LDFLAGS+= "-fPIC"
OBJS= bitstream.o utils.o mem.o allcodecs.o \
mpegvideo.o jrevdct.o jfdctfst.o jfdctint.o\
mpegaudio.o ac3enc.o mjpeg.o resample.o resample2.o dsputil.o \
Index: libs/ffmpeg/config.h
===================================================================
--- libs/ffmpeg/config.h (revision 4040)
+++ libs/ffmpeg/config.h (working copy)
@@ -1,6 +1,6 @@
-#define ARCH_X86 1
-#define HAVE_MMX 1
-#define __CPU__ 586
+#define ARCH_X86_64 1
+#define HAVE_MMX 0
+#define __CPU__ 686
#define TUNECPU generic
#define HAVE_BUILTIN_VECTOR 1
#define HAVE_LOCALTIME_R 1
Index: libs/ffmpeg/Makefile
===================================================================
--- libs/ffmpeg/Makefile (revision 4040)
+++ libs/ffmpeg/Makefile (working copy)
@@ -6,8 +6,8 @@
VPATH=$(SRC_PATH)
-CFLAGS=$(OPTFLAGS) -I. -I$(SRC_PATH) -I$(SRC_PATH)/libavutil -I$(SRC_PATH)/libavcodec -I$(SRC_PATH)/libavformat -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE
-LDFLAGS+= -g
+CFLAGS=$(OPTFLAGS) -I. -I$(SRC_PATH) -I$(SRC_PATH)/libavutil -I$(SRC_PATH)/libavcodec -I$(SRC_PATH)/libavformat -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE -fPIC
+LDFLAGS+= -g -fPIC
ifeq ($(TARGET_GPROF),yes)
CFLAGS+=-p
Index: libs/ffmpeg/libavformat/Makefile
===================================================================
--- libs/ffmpeg/libavformat/Makefile (revision 4040)
+++ libs/ffmpeg/libavformat/Makefile (working copy)
@@ -6,8 +6,8 @@
VPATH=$(SRC_PATH)/libavformat
-CFLAGS=$(OPTFLAGS) -I.. -I$(SRC_PATH) -I$(SRC_PATH)/libavutil -I$(SRC_PATH)/libavcodec -DHAVE_AV_CONFIG_H -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE
-
+CFLAGS=$(OPTFLAGS) -I.. -I$(SRC_PATH) -I$(SRC_PATH)/libavutil -I$(SRC_PATH)/libavcodec -DHAVE_AV_CONFIG_H -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE -fPIC
+LDFLAGS+=-fPIC
OBJS= utils.o cutils.o os_support.o allformats.o
PPOBJS=
Index: wengophone/src/model/imwrapper/IMChatSession.cpp
===================================================================
--- wengophone/src/model/imwrapper/IMChatSession.cpp (revision 4040)
+++ wengophone/src/model/imwrapper/IMChatSession.cpp (working copy)
@@ -94,6 +94,6 @@
return (getId() == imChatSession.getId());
}
-int IMChatSession::getId() const {
- return (int)this;
+long IMChatSession::getId() const {
+ return (long)this;
}
Index: wengophone/src/model/imwrapper/IMChatSession.h
===================================================================
--- wengophone/src/model/imwrapper/IMChatSession.h (revision 4040)
+++ wengophone/src/model/imwrapper/IMChatSession.h (working copy)
@@ -51,7 +51,7 @@
bool operator == (const IMChatSession & imChatSession) const;
- int getId() const;
+ long getId() const;
private:
_______________________________________________
Wengophone-devel mailing list
[email protected]
http://dev.openwengo.com/mailman/listinfo/wengophone-devel
