Changeset 15434


Ignore:
Timestamp:
Aug 10, 2012, 4:53:57 AM (7 years ago)
Author:
gb
Message:

Try to account for Debian "multiarch" lossage.
This seems to be able to parse headers (using a gcc-4.0-based ffigen
program) on an x8632 Debian 7.0beta system; need to ensure that it also
does so on platforms not yet suffering from this nonsense.

Location:
trunk/x86-headers
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • trunk/x86-headers/elf/C/populate.sh

    r11055 r15434  
    11#!/bin/sh
    2 CFLAGS="-m32";export CFLAGS
     2ARCH_SUBDIR=i386-linux-gnu
     3CFLAGS="-isystem /usr/include/$ARCH_SUBDIR -m32 -D_GNU_SOURCE $CFLAGS";export CFLAGS
    34rm -rf usr
    45# if the libelf in question comes from RedHat's elfutils,
  • trunk/x86-headers/gl/C/populate.sh

    r10779 r15434  
    11#!/bin/sh
    2 #CFLAGS="-m64";export CFLAGS
     2ARCH_SUBDIR=i386-linux-gnu
     3CFLAGS="-isystem /usr/include/$ARCH_SUBDIR -m32 -D_GNU_SOURCE $CFLAGS";export CFLAGS
    34rm -rf usr
    45h-to-ffi.sh /usr/include/GL/glx.h
  • trunk/x86-headers/gnome2/C/populate.sh

    r11519 r15434  
    11#!/bin/sh
    2 CFLAGS="-m32"; export CFLAGS
     2ARCH_SUBDIR=i386-linux-gnu
     3CFLAGS="-isystem /usr/include/$ARCH_SUBDIR -m32 -D_GNU_SOURCE $CFLAGS";export CFLAGS
     4rm -rf usr
     5
    36h-to-ffi.sh `pkg-config --cflags libgnomeui-2.0` /usr/include/libgnomeui-2.0/gnome.h
  • trunk/x86-headers/gtk2/C/populate.sh

    r10779 r15434  
    11#!/bin/sh
     2ARCH_SUBDIR=i386-linux-gnu
     3CFLAGS="-isystem /usr/include/$ARCH_SUBDIR -m32 -D_GNU_SOURCE $CFLAGS";export CFLAGS
     4rm -rf usr
     5
    26h-to-ffi.sh `pkg-config --cflags gtk+-2.0` /usr/include/gtk-2.0/gtk/gtk.h
  • trunk/x86-headers/jni/C/populate.sh

    r11490 r15434  
    11#!/bin/sh
    2 JVMINCLUDE=/usr/lib/jvm/java-openjdk/include
    3 CFLAGS="-m32 -I${JVMINCLUDE}/linux";export CFLAGS
     2JVMINCLUDE=/usr/lib/jvm/java-6-openjdk-i386/include
     3ARCH_SUBDIR=i386-linux-gnu
     4CFLAGS="-isystem /usr/include/$ARCH_SUBDIR -m32 -I${JVMINCLUDE}/linux";export CFLAGS
    45rm -rf usr
    56h-to-ffi.sh ${JVMINCLUDE}/jni.h
  • trunk/x86-headers/libc/C/populate.sh

    r10861 r15434  
    33# it (mis)uses features not supported by GCC 4.0.  See
    44# <http://gcc.gnu.org/ml/gcc/2005-01/msg00509.html>
    5 CFLAGS="-m32 -D_GNU_SOURCE";export CFLAGS
     5ARCH_SUBDIR=i386-linux-gnu
     6CFLAGS="-isystem /usr/include/$ARCH_SUBDIR -m32 -D_GNU_SOURCE $CFLAGS";export CFLAGS
     7rm -rf usr
     8
     9arch_specific_file()
     10{
     11 if [ -e /usr/include/$ARCH_SUBDIR/$1 ]; then
     12  echo /usr/include/$ARCH_SUBDIR/$1
     13 elif [ -e /usr/include/$1 ]; then
     14  echo /usr/include/$1
     15 else
     16  echo /not/found/$1
     17 fi
     18}
     19
    620h-to-ffi.sh /usr/include/_G_config.h
    7 h-to-ffi.sh /usr/include/a.out.h
     21h-to-ffi.sh `arch_specific_file a.out.h`
    822h-to-ffi.sh /usr/include/aio.h
    923h-to-ffi.sh /usr/include/aliases.h
     
    4054h-to-ffi.sh /usr/include/fmtmsg.h
    4155h-to-ffi.sh /usr/include/fnmatch.h
    42 h-to-ffi.sh /usr/include/fpu_control.h
     56h-to-ffi.sh `arch_specific_file fpu_control.h`
    4357h-to-ffi.sh /usr/include/fstab.h
    4458h-to-ffi.sh /usr/include/fts.h
     
    4862h-to-ffi.sh /usr/include/glob.h
    4963h-to-ffi.sh /usr/include/gnu-versions.h
    50 h-to-ffi.sh /usr/include/gnu/lib-names.h
    51 h-to-ffi.sh /usr/include/gnu/libc-version.h
    52 h-to-ffi.sh /usr/include/gnu/stubs.h
     64h-to-ffi.sh `arch_specific_file gnu/lib-names.h`
     65h-to-ffi.sh `arch_specific_file gnu/libc-version.h`
     66h-to-ffi.sh `arch_specific_file gnu/stubs.h`
    5367h-to-ffi.sh /usr/include/grp.h
    5468h-to-ffi.sh /usr/include/iconv.h
    55 h-to-ffi.sh /usr/include/ieee754.h
     69h-to-ffi.sh `arch_specific_file ieee754.h`
    5670h-to-ffi.sh /usr/include/ifaddrs.h
    5771h-to-ffi.sh /usr/include/inttypes.h
     
    7488h-to-ffi.sh /usr/include/net/if_arp.h
    7589h-to-ffi.sh /usr/include/net/if_packet.h
    76 h-to-ffi.sh -include /usr/include/sys/capability.h /usr/include/net/if_ppp.h
     90h-to-ffi.sh -include `arch_specific_file sys/capability.h` /usr/include/net/if_ppp.h
    7791h-to-ffi.sh /usr/include/net/if_shaper.h
    7892h-to-ffi.sh /usr/include/net/if_slip.h
    79 h-to-ffi.sh -include /usr/include/sys/capability.h -include /usr/include/net/ppp_defs.h /usr/include/net/ppp-comp.h
     93h-to-ffi.sh -include `arch_specific_file sys/capability.h` -include /usr/include/net/ppp_defs.h /usr/include/net/ppp-comp.h
    8094h-to-ffi.sh /usr/include/net/route.h
    8195h-to-ffi.sh /usr/include/netash/ash.h
    82 #h-to-ffi.sh -include /usr/include/sys/socket.h /usr/include/netatalk/at.h
     96#h-to-ffi.sh -include `arch_specific_file sys/socket.h` /usr/include/netatalk/at.h
    8397h-to-ffi.sh /usr/include/netax25/ax25.h
    8498h-to-ffi.sh /usr/include/netdb.h
     
    106120h-to-ffi.sh /usr/include/obstack.h
    107121h-to-ffi.sh /usr/include/paths.h
    108 h-to-ffi.sh -include /usr/include/sys/types.h -include /usr/include/sys/time.h  -include /usr/include/stdio.h -include /usr/include/pcap-bpf.h /usr/include/pcap-namedb.h
     122h-to-ffi.sh -include `arch_specific_file sys/types.h` -include `arch_specific_file sys/time.h`  -include /usr/include/stdio.h -include /usr/include/pcap-bpf.h /usr/include/pcap-namedb.h
    109123h-to-ffi.sh /usr/include/pcap.h
    110124h-to-ffi.sh /usr/include/pci/config.h
     
    120134h-to-ffi.sh /usr/include/pty.h
    121135h-to-ffi.sh /usr/include/pwd.h
    122 h-to-ffi.sh -include /usr/include/sys/types.h /usr/include/re_comp.h
    123 h-to-ffi.sh -include /usr/include/sys/types.h /usr/include/regex.h
     136h-to-ffi.sh -include `arch_specific_file sys/types.h` /usr/include/re_comp.h
     137h-to-ffi.sh -include `arch_specific_file sys/types.h` /usr/include/regex.h
    124138#h-to-ffi.sh /usr/include/regexp.h
    125139h-to-ffi.sh /usr/include/rpc/auth.h
     
    162176h-to-ffi.sh /usr/include/scsi/scsi.h
    163177h-to-ffi.sh /usr/include/scsi/scsi_ioctl.h
    164 h-to-ffi.sh -include /usr/include/sys/types.h /usr/include/scsi/sg.h
     178h-to-ffi.sh -include `arch_specific_file sys/types.h` /usr/include/scsi/sg.h
    165179h-to-ffi.sh /usr/include/search.h
    166180h-to-ffi.sh /usr/include/semaphore.h
     
    178192h-to-ffi.sh /usr/include/strings.h
    179193h-to-ffi.sh /usr/include/stropts.h
    180 h-to-ffi.sh /usr/include/sys/acct.h
    181 h-to-ffi.sh /usr/include/sys/bitypes.h
    182 h-to-ffi.sh /usr/include/sys/cdefs.h
    183 h-to-ffi.sh /usr/include/sys/dir.h
    184 h-to-ffi.sh /usr/include/sys/errno.h
    185 h-to-ffi.sh /usr/include/sys/fcntl.h
    186 h-to-ffi.sh /usr/include/sys/file.h
    187 h-to-ffi.sh /usr/include/sys/fsuid.h
    188 h-to-ffi.sh /usr/include/sys/gmon.h
    189 h-to-ffi.sh /usr/include/sys/gmon_out.h
    190 h-to-ffi.sh /usr/include/sys/ioctl.h
    191 h-to-ffi.sh /usr/include/sys/ipc.h
    192 h-to-ffi.sh /usr/include/sys/kd.h
    193 h-to-ffi.sh /usr/include/sys/kdaemon.h
    194 h-to-ffi.sh /usr/include/sys/klog.h
    195 h-to-ffi.sh /usr/include/sys/mman.h
    196 h-to-ffi.sh /usr/include/sys/mount.h
    197 h-to-ffi.sh /usr/include/sys/msg.h
    198 h-to-ffi.sh /usr/include/sys/mtio.h
    199 h-to-ffi.sh /usr/include/sys/param.h
    200 h-to-ffi.sh /usr/include/sys/pci.h
    201 h-to-ffi.sh /usr/include/sys/poll.h
    202 h-to-ffi.sh /usr/include/sys/prctl.h
    203 h-to-ffi.sh /usr/include/sys/procfs.h
    204 h-to-ffi.sh /usr/include/sys/profil.h
    205 h-to-ffi.sh /usr/include/sys/ptrace.h
    206 h-to-ffi.sh /usr/include/sys/queue.h
    207 h-to-ffi.sh /usr/include/sys/quota.h
    208 h-to-ffi.sh /usr/include/sys/raw.h
    209 h-to-ffi.sh /usr/include/sys/reboot.h
    210 h-to-ffi.sh /usr/include/sys/resource.h
    211 h-to-ffi.sh /usr/include/sys/select.h
    212 h-to-ffi.sh /usr/include/sys/sem.h
    213 h-to-ffi.sh /usr/include/sys/sendfile.h
    214 h-to-ffi.sh /usr/include/sys/shm.h
    215 h-to-ffi.sh /usr/include/sys/signal.h
    216 h-to-ffi.sh /usr/include/sys/socket.h
    217 h-to-ffi.sh /usr/include/sys/socketvar.h
    218 h-to-ffi.sh /usr/include/sys/soundcard.h
    219 h-to-ffi.sh /usr/include/sys/stat.h
    220 h-to-ffi.sh /usr/include/sys/statfs.h
    221 h-to-ffi.sh /usr/include/sys/statvfs.h
    222 h-to-ffi.sh /usr/include/sys/stropts.h
    223 h-to-ffi.sh /usr/include/sys/swap.h
    224 h-to-ffi.sh /usr/include/sys/syscall.h
    225 h-to-ffi.sh /usr/include/sys/sysctl.h
    226 h-to-ffi.sh /usr/include/sys/sysinfo.h
    227 h-to-ffi.sh /usr/include/sys/syslog.h
    228 h-to-ffi.sh /usr/include/sys/sysmacros.h
    229 h-to-ffi.sh /usr/include/sys/termios.h
    230 h-to-ffi.sh /usr/include/sys/time.h
    231 h-to-ffi.sh /usr/include/sys/timeb.h
    232 h-to-ffi.sh /usr/include/sys/times.h
    233 h-to-ffi.sh /usr/include/sys/timex.h
    234 h-to-ffi.sh /usr/include/sys/ttychars.h
    235 h-to-ffi.sh /usr/include/sys/ttydefaults.h
    236 h-to-ffi.sh /usr/include/sys/types.h
    237 h-to-ffi.sh /usr/include/sys/ucontext.h
    238 h-to-ffi.sh /usr/include/sys/uio.h
    239 h-to-ffi.sh /usr/include/sys/ultrasound.h
    240 h-to-ffi.sh /usr/include/sys/un.h
    241 h-to-ffi.sh /usr/include/sys/unistd.h
    242 h-to-ffi.sh -include /usr/include/sys/types.h /usr/include/sys/user.h
    243 h-to-ffi.sh /usr/include/sys/ustat.h
    244 h-to-ffi.sh /usr/include/sys/utsname.h
    245 h-to-ffi.sh /usr/include/sys/vfs.h
    246 h-to-ffi.sh /usr/include/sys/vlimit.h
    247 h-to-ffi.sh /usr/include/sys/vt.h
    248 h-to-ffi.sh /usr/include/sys/vtimes.h
    249 h-to-ffi.sh /usr/include/sys/wait.h
     194h-to-ffi.sh `arch_specific_file sys/acct.h`
     195h-to-ffi.sh `arch_specific_file sys/bitypes.h`
     196h-to-ffi.sh `arch_specific_file sys/cdefs.h`
     197h-to-ffi.sh `arch_specific_file sys/dir.h`
     198h-to-ffi.sh `arch_specific_file sys/errno.h`
     199h-to-ffi.sh `arch_specific_file sys/fcntl.h`
     200h-to-ffi.sh `arch_specific_file sys/file.h`
     201h-to-ffi.sh `arch_specific_file sys/fsuid.h`
     202h-to-ffi.sh `arch_specific_file sys/gmon.h`
     203h-to-ffi.sh `arch_specific_file sys/gmon_out.h`
     204h-to-ffi.sh `arch_specific_file sys/ioctl.h`
     205h-to-ffi.sh `arch_specific_file sys/ipc.h`
     206h-to-ffi.sh `arch_specific_file sys/kd.h`
     207h-to-ffi.sh `arch_specific_file sys/kdaemon.h`
     208h-to-ffi.sh `arch_specific_file sys/klog.h`
     209h-to-ffi.sh `arch_specific_file sys/mman.h`
     210h-to-ffi.sh `arch_specific_file sys/mount.h`
     211h-to-ffi.sh `arch_specific_file sys/msg.h`
     212h-to-ffi.sh `arch_specific_file sys/mtio.h`
     213h-to-ffi.sh `arch_specific_file sys/param.h`
     214h-to-ffi.sh `arch_specific_file sys/pci.h`
     215h-to-ffi.sh `arch_specific_file sys/poll.h`
     216h-to-ffi.sh `arch_specific_file sys/prctl.h`
     217h-to-ffi.sh `arch_specific_file sys/procfs.h`
     218h-to-ffi.sh `arch_specific_file sys/profil.h`
     219h-to-ffi.sh `arch_specific_file sys/ptrace.h`
     220h-to-ffi.sh `arch_specific_file sys/queue.h`
     221h-to-ffi.sh `arch_specific_file sys/quota.h`
     222h-to-ffi.sh `arch_specific_file sys/raw.h`
     223h-to-ffi.sh `arch_specific_file sys/reboot.h`
     224h-to-ffi.sh `arch_specific_file sys/resource.h`
     225h-to-ffi.sh `arch_specific_file sys/select.h`
     226h-to-ffi.sh `arch_specific_file sys/sem.h`
     227h-to-ffi.sh `arch_specific_file sys/sendfile.h`
     228h-to-ffi.sh `arch_specific_file sys/shm.h`
     229h-to-ffi.sh `arch_specific_file sys/signal.h`
     230h-to-ffi.sh `arch_specific_file sys/socket.h`
     231h-to-ffi.sh `arch_specific_file sys/socketvar.h`
     232h-to-ffi.sh `arch_specific_file sys/soundcard.h`
     233h-to-ffi.sh `arch_specific_file sys/stat.h`
     234h-to-ffi.sh `arch_specific_file sys/statfs.h`
     235h-to-ffi.sh `arch_specific_file sys/statvfs.h`
     236h-to-ffi.sh `arch_specific_file sys/stropts.h`
     237h-to-ffi.sh `arch_specific_file sys/swap.h`
     238h-to-ffi.sh `arch_specific_file sys/syscall.h`
     239h-to-ffi.sh `arch_specific_file sys/sysctl.h`
     240h-to-ffi.sh `arch_specific_file sys/sysinfo.h`
     241h-to-ffi.sh `arch_specific_file sys/syslog.h`
     242h-to-ffi.sh `arch_specific_file sys/sysmacros.h`
     243h-to-ffi.sh `arch_specific_file sys/termios.h`
     244h-to-ffi.sh `arch_specific_file sys/time.h`
     245h-to-ffi.sh `arch_specific_file sys/timeb.h`
     246h-to-ffi.sh `arch_specific_file sys/times.h`
     247h-to-ffi.sh `arch_specific_file sys/timex.h`
     248h-to-ffi.sh `arch_specific_file sys/ttychars.h`
     249h-to-ffi.sh `arch_specific_file sys/ttydefaults.h`
     250h-to-ffi.sh `arch_specific_file sys/types.h`
     251h-to-ffi.sh `arch_specific_file sys/ucontext.h`
     252h-to-ffi.sh `arch_specific_file sys/uio.h`
     253h-to-ffi.sh `arch_specific_file sys/ultrasound.h`
     254h-to-ffi.sh `arch_specific_file sys/un.h`
     255h-to-ffi.sh `arch_specific_file sys/unistd.h`
     256h-to-ffi.sh -include `arch_specific_file sys/types.h` `arch_specific_file sys/user.h`
     257h-to-ffi.sh `arch_specific_file sys/ustat.h`
     258h-to-ffi.sh `arch_specific_file sys/utsname.h`
     259h-to-ffi.sh `arch_specific_file sys/vfs.h`
     260h-to-ffi.sh `arch_specific_file sys/vlimit.h`
     261h-to-ffi.sh `arch_specific_file sys/vt.h`
     262h-to-ffi.sh `arch_specific_file sys/vtimes.h`
     263h-to-ffi.sh `arch_specific_file sys/wait.h`
    250264h-to-ffi.sh /usr/include/syscall.h
    251265h-to-ffi.sh /usr/include/sysexits.h
Note: See TracChangeset for help on using the changeset viewer.