← Back to branch summary

~ubuntu-branches/ubuntu/vivid/oss4/vivid-proposed

« back to all changes in this revision

Viewing changes to debian/create-ma-tree.sh

  • Committer: Package Import Robot
  • Author(s): Sebastien NOEL, Sebastien NOEL, Benda Xu
  • Date: 2014-10-23 22:47:56 UTC
  • mfrom: (1.1.7)
  • Revision ID: package-import@ubuntu.com-20141023224756-ugge2zw3qib5ldip
Tags: 4.2-build2010-1
http://bugs.debian.org/696751
http://bugs.debian.org/761783
[ Sebastien NOEL ]
* New upstream release.
  - fix build with recent kernel. (Closes: #696751)
* Add build dependency on libtool-bin. (Closes: #761783)

[ Benda Xu ]
* Use debhelper 9.
* Bump to standard 3.9.6.
* Add Benda Xu to uploaders.
* Run wrap-and-sort.
* Canonicalize Vcs-Svn field and add Vcs-Browser field.
* Get rid of limits.h copy hack, leverage include-fixed from gcc.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/create-ma-tree.sh
56
56
OBJS="os_linux.o `echo $SOURCES |sed -e 's,\.c,.o,g'`"
57
57
cat >"$NEWDIR"/core/Makefile <<EOF
58
58
MULTIARCH_PATH = /usr/include/\$(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
59
 
EXTRA_CFLAGS = -I\$(KBUILD_EXTMOD) -mhard-float -isystem /usr/include -isystem \$(MULTIARCH_PATH)
 
59
EXTRA_CFLAGS = -I\$(KBUILD_EXTMOD) -mhard-float -isystem /usr/include -isystem \$(MULTIARCH_PATH) \
 
60
        -isystem \$(shell \$(CC) --print-file-name=include-fixed)
60
61
obj-m += osscore.o
61
62
osscore-objs := oss_core.o $OBJS
62
63
EOF
64
65
# This is somewhat ugly, but unavoidable -- parts of OSS need those defines and
65
66
# access to system includes while osscore.c can't be compiled with them...
66
67
for i in $OBJS; do
67
 
        echo "CFLAGS_$i = -isystem /usr/include -isystem \$(MULTIARCH_PATH) -D_KERNEL" >>"$NEWDIR"/core/Makefile
 
68
        echo "CFLAGS_$i = -D_KERNEL" >>"$NEWDIR"/core/Makefile
68
69
done
69
70
 
70
71
 
77
78
        echo "};" >> osscore_symbols.inc
78
79
 
79
80
MULTIARCH_PATH = /usr/include/\$(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
80
 
EXTRA_CFLAGS=-D_KERNEL -I\$(KBUILD_EXTMOD)/../core -I\$(KBUILD_EXTMOD) -isystem /usr/include -isystem \$(MULTIARCH_PATH) -mhard-float
 
81
EXTRA_CFLAGS=-D_KERNEL -I\$(KBUILD_EXTMOD)/../core -I\$(KBUILD_EXTMOD) -isystem /usr/include -isystem \$(MULTIARCH_PATH) -mhard-float \
 
82
        -isystem \$(shell \$(CC) --print-file-name=include-fixed)
81
83
EOF
82
84
 
83
85
# Merge the drivers...